1 parent
3358eeb54c
commit
a0b7d9969a
6 files changed
+14
-19
No files matched your search
@@ -61,7 +61,6 @@ func (s *SysMenuControl) Generate(model *models.SysMenu) {
|
||||
model.Paths = s.Paths
|
||||
model.MenuType = s.MenuType
|
||||
model.Action = s.Action
|
||||
model.Apis = s.Apis
|
||||
model.SysApi = s.SysApi
|
||||
model.Permission = s.Permission
|
||||
model.ParentId = s.ParentId
|
||||
|
||||
@@ -87,9 +87,6 @@ func (e *SysMenu) Insert(c *dto.SysMenuControl) *SysMenu {
|
||||
var err error
|
||||
var data models.SysMenu
|
||||
c.Generate(&data)
|
||||
sysApi := make([]models.SysApi, 0)
|
||||
e.Orm.Where("id in ?", c.Apis).Find(&sysApi)
|
||||
data.SysApi = sysApi
|
||||
err = e.Orm.Create(&data).Error
|
||||
if err != nil {
|
||||
e.Log.Errorf("db error:%s", err)
|
||||
|
||||
@@ -204,10 +204,8 @@ func (e *SysRole) UpdateDataScope(c *dto.RoleDataScopeReq) *SysRole {
|
||||
}()
|
||||
var dlist = make([]models.SysDept, 0)
|
||||
var model = models.SysRole{}
|
||||
tx.Preload("SysDept").First(&model, c.RoleId)
|
||||
if c.DataScope == "2" {
|
||||
tx.Where("dept_id in ?", c.DeptIds).Find(&dlist)
|
||||
}
|
||||
tx.Preload("SysDept").First(&model, c.DeptIds)
|
||||
tx.Where("id in ?", c.DeptIds).Find(&dlist)
|
||||
err = tx.Model(&model).Association("SysDept").Delete(model.SysDept)
|
||||
if err != nil {
|
||||
e.Log.Errorf("delete SysDept error:%s", err)
|
||||
@@ -292,4 +290,4 @@ func (e *SysRole) GetById(roleId int) ([]string, error) {
|
||||
permissions = append(permissions, l[i].Permission)
|
||||
}
|
||||
return permissions, nil
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user