From 5714ffde7bb7268d9dc08adecb199b02a7041e06 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Sat, 14 Nov 2020 01:02:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E9=9D=9E?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=EF=BC=88?= =?UTF-8?q?#292=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/system/menu.go | 9 ++++++--- app/admin/models/menu.go | 30 +++++++++++++++++------------- app/admin/models/role.go | 22 +++++++++++++++++++++- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/app/admin/apis/system/menu.go b/app/admin/apis/system/menu.go index abe1fa7..ffe65e0 100644 --- a/app/admin/apis/system/menu.go +++ b/app/admin/apis/system/menu.go @@ -53,10 +53,13 @@ func GetMenuTreeRoleselect(c *gin.Context) { id, err := tools.StringToInt(c.Param("roleId")) SysRole.RoleId = id + //var r *models.SysRole + r, err := SysRole.Get() + var result *[]models.MenuLable menuIds := make([]int, 0) - if tools.GetRoleName(c) != "admin" { - result, err = Menu.SetMenuLable() + if r.RoleKey != "admin" { + result, err = Menu.SetMenuLabel() tools.HasError(err, "抱歉未找到相关信息", -1) if id != 0 { menuIds, err = SysRole.GetRoleMeunId() @@ -81,7 +84,7 @@ func GetMenuTreeRoleselect(c *gin.Context) { // @Security Bearer func GetMenuTreeelect(c *gin.Context) { var data models.Menu - result, err := data.SetMenuLable() + result, err := data.SetMenuLabel() tools.HasError(err, "抱歉未找到相关信息", -1) app.OK(c, result, "") } diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index 5c26633..a50175d 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -146,7 +146,7 @@ func DiguiMenu(menulist *[]Menu, menu Menu) Menu { return menu } -func (e *Menu) SetMenuLable() (m *[]MenuLable, err error) { +func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) { menulist, err := e.Get() ml := make([]MenuLable, 0) @@ -157,14 +157,14 @@ func (e *Menu) SetMenuLable() (m *[]MenuLable, err error) { e := MenuLable{} e.Id = menulist[i].MenuId e.Label = menulist[i].Title - menusInfo := DiguiMenuLable(&menulist, e) + menusInfo := MenuLabelCall(&menulist, e) ml = append(ml, menusInfo) } return &ml, err } -func DiguiMenuLable(menulist *[]Menu, menu MenuLable) MenuLable { +func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable { list := *menulist min := make([]MenuLable, 0) @@ -178,27 +178,31 @@ func DiguiMenuLable(menulist *[]Menu, menu MenuLable) MenuLable { mi.Label = list[j].Title mi.Children = []MenuLable{} if list[j].MenuType != "F" { - ms := DiguiMenuLable(menulist, mi) + ms := MenuLabelCall(menulist, mi) min = append(min, ms) } else { min = append(min, mi) } } - menu.Children = min + if len(min) > 0 { + menu.Children = min + } else { + menu.Children = nil + } return menu } -func (e *Menu) SetMenuRole(rolename string) (m []Menu, err error) { +func (e *Menu) SetMenuRole(roleName string) (m []Menu, err error) { - menulist, err := e.GetByRoleName(rolename) + menus, err := e.GetByRoleName(roleName) m = make([]Menu, 0) - for i := 0; i < len(menulist); i++ { - if menulist[i].ParentId != 0 { + for i := 0; i < len(menus); i++ { + if menus[i].ParentId != 0 { continue } - menusInfo := DiguiMenu(&menulist, menulist[i]) + menusInfo := DiguiMenu(&menus, menus[i]) m = append(m, menusInfo) } @@ -216,14 +220,14 @@ func (e *MenuRole) Get() (Menus []MenuRole, err error) { return } -func (e *Menu) GetByRoleName(rolename string) (Menus []Menu, err error) { +func (e *Menu) GetByRoleName(roleName string) (Menus []Menu, err error) { var table *gorm.DB - if rolename == "admin" { + if roleName == "admin" { table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*") table = table.Where(" menu_type in ('M','C')") } else { table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*").Joins("left join sys_role_menu on sys_role_menu.menu_id=sys_menu.menu_id") - table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", rolename) + table = table.Where("sys_role_menu.role_name=? and menu_type in ('M','C')", roleName) } if err = table.Order("sort").Find(&Menus).Error; err != nil { return diff --git a/app/admin/models/role.go b/app/admin/models/role.go index 1a0bf2d..ec125b8 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -88,6 +88,21 @@ func (role *SysRole) Get() (SysRole SysRole, err error) { return } +func (role *SysRole) GetOne(sysRole *SysRole) (err error) { + table := orm.Eloquent.Table("sys_role") + if role.RoleId != 0 { + table = table.Where("role_id = ?", role.RoleId) + } + if role.RoleName != "" { + table = table.Where("role_name = ?", role.RoleName) + } + if err = table.First(sysRole).Error; err != nil { + return + } + + return +} + func (role *SysRole) GetList() (SysRole []SysRole, err error) { table := orm.Eloquent.Table("sys_role") if role.RoleId != 0 { @@ -107,7 +122,12 @@ func (role *SysRole) GetList() (SysRole []SysRole, err error) { func (role *SysRole) GetRoleMeunId() ([]int, error) { menuIds := make([]int, 0) menuList := make([]MenuIdList, 0) - if err := orm.Eloquent.Table("sys_role_menu").Select("sys_role_menu.menu_id").Where("role_id = ? ", role.RoleId).Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? and parent_id is not null)", role.RoleId).Find(&menuList).Error; err != nil { + if err := orm.Eloquent.Table("sys_role_menu"). + Select("sys_role_menu.menu_id"). + Where("role_id = ? ", role.RoleId). + Where(" sys_role_menu.menu_id not in(select sys_menu.parent_id from sys_role_menu " + + "LEFT JOIN sys_menu on sys_menu.menu_id=sys_role_menu.menu_id where role_id =? and parent_id is not null)", role.RoleId). + Find(&menuList).Error; err != nil { return nil, err }