From c814439f93d618c4362701c3f5b54609438cc933 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 24 Oct 2020 13:14:57 +0800 Subject: [PATCH] =?UTF-8?q?feat=E2=9C=A8=20admin=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9D=83=E9=99=90=E6=94=B9=E4=B8=BA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/system/menu.go | 13 +++++++++---- app/admin/models/menu.go | 8 ++++---- app/admin/models/role.go | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/admin/apis/system/menu.go b/app/admin/apis/system/menu.go index dd01d62..abe1fa7 100644 --- a/app/admin/apis/system/menu.go +++ b/app/admin/apis/system/menu.go @@ -46,17 +46,22 @@ func GetMenu(c *gin.Context) { app.OK(c, result, "") } +// GetMenuTreeRoleselect 角色修改中的菜单列表 func GetMenuTreeRoleselect(c *gin.Context) { var Menu models.Menu var SysRole models.SysRole + id, err := tools.StringToInt(c.Param("roleId")) SysRole.RoleId = id - result, err := Menu.SetMenuLable() - tools.HasError(err, "抱歉未找到相关信息", -1) + var result *[]models.MenuLable menuIds := make([]int, 0) - if id != 0 { - menuIds, err = SysRole.GetRoleMeunId() + if tools.GetRoleName(c) != "admin" { + result, err = Menu.SetMenuLable() tools.HasError(err, "抱歉未找到相关信息", -1) + if id != 0 { + menuIds, err = SysRole.GetRoleMeunId() + tools.HasError(err, "抱歉未找到相关信息", -1) + } } app.Custum(c, gin.H{ "code": 200, diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index 667d847..5c26633 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -146,10 +146,10 @@ func DiguiMenu(menulist *[]Menu, menu Menu) Menu { return menu } -func (e *Menu) SetMenuLable() (m []MenuLable, err error) { +func (e *Menu) SetMenuLable() (m *[]MenuLable, err error) { menulist, err := e.Get() - m = make([]MenuLable, 0) + ml := make([]MenuLable, 0) for i := 0; i < len(menulist); i++ { if menulist[i].ParentId != 0 { continue @@ -159,9 +159,9 @@ func (e *Menu) SetMenuLable() (m []MenuLable, err error) { e.Label = menulist[i].Title menusInfo := DiguiMenuLable(&menulist, e) - m = append(m, menusInfo) + ml = append(ml, menusInfo) } - return + return &ml, err } func DiguiMenuLable(menulist *[]Menu, menu MenuLable) MenuLable { diff --git a/app/admin/models/role.go b/app/admin/models/role.go index 1088c31..74c649b 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -22,9 +22,9 @@ type SysRole struct { DataScope string `json:"dataScope" gorm:"size:128;"` BaseModel - Params string `json:"params" gorm:"-"` - MenuIds []int `json:"menuIds" gorm:"-"` - DeptIds []int `json:"deptIds" gorm:"-"` + Params string `json:"params" gorm:"-"` + MenuIds []int `json:"menuIds" gorm:"-"` + DeptIds []int `json:"deptIds" gorm:"-"` } func (SysRole) TableName() string {