fix🐛 修复非管理员角色无法配置权限问题(#292)
This commit is contained in:
1 parent
f1e521522a
commit
5714ffde7b
3 files changed
+44
-17
No files matched your search
@@ -53,10 +53,13 @@ func GetMenuTreeRoleselect(c *gin.Context) {
|
|||||||
|
|
||||||
id, err := tools.StringToInt(c.Param("roleId"))
|
id, err := tools.StringToInt(c.Param("roleId"))
|
||||||
SysRole.RoleId = id
|
SysRole.RoleId = id
|
||||||
|
//var r *models.SysRole
|
||||||
|
r, err := SysRole.Get()
|
||||||
|
|
||||||
var result *[]models.MenuLable
|
var result *[]models.MenuLable
|
||||||
menuIds := make([]int, 0)
|
menuIds := make([]int, 0)
|
||||||
if tools.GetRoleName(c) != "admin" {
|
if r.RoleKey != "admin" {
|
||||||
result, err = Menu.SetMenuLable()
|
result, err = Menu.SetMenuLabel()
|
||||||
tools.HasError(err, "抱歉未找到相关信息", -1)
|
tools.HasError(err, "抱歉未找到相关信息", -1)
|
||||||
if id != 0 {
|
if id != 0 {
|
||||||
menuIds, err = SysRole.GetRoleMeunId()
|
menuIds, err = SysRole.GetRoleMeunId()
|
||||||
@@ -81,7 +84,7 @@ func GetMenuTreeRoleselect(c *gin.Context) {
|
|||||||
// @Security Bearer
|
// @Security Bearer
|
||||||
func GetMenuTreeelect(c *gin.Context) {
|
func GetMenuTreeelect(c *gin.Context) {
|
||||||
var data models.Menu
|
var data models.Menu
|
||||||
result, err := data.SetMenuLable()
|
result, err := data.SetMenuLabel()
|
||||||
tools.HasError(err, "抱歉未找到相关信息", -1)
|
tools.HasError(err, "抱歉未找到相关信息", -1)
|
||||||
app.OK(c, result, "")
|
app.OK(c, result, "")
|
||||||
}
|
}
|
||||||
|
|||||||
+17
-13
@@ -146,7 +146,7 @@ func DiguiMenu(menulist *[]Menu, menu Menu) Menu {
|
|||||||
return menu
|
return menu
|
||||||
}
|
}
|
||||||
|
|
||||||
func (e *Menu) SetMenuLable() (m *[]MenuLable, err error) {
|
func (e *Menu) SetMenuLabel() (m *[]MenuLable, err error) {
|
||||||
menulist, err := e.Get()
|
menulist, err := e.Get()
|
||||||
|
|
||||||
ml := make([]MenuLable, 0)
|
ml := make([]MenuLable, 0)
|
||||||
@@ -157,14 +157,14 @@ func (e *Menu) SetMenuLable() (m *[]MenuLable, err error) {
|
|||||||
e := MenuLable{}
|
e := MenuLable{}
|
||||||
e.Id = menulist[i].MenuId
|
e.Id = menulist[i].MenuId
|
||||||
e.Label = menulist[i].Title
|
e.Label = menulist[i].Title
|
||||||
menusInfo := DiguiMenuLable(&menulist, e)
|
menusInfo := MenuLabelCall(&menulist, e)
|
||||||
|
|
||||||
ml = append(ml, menusInfo)
|
ml = append(ml, menusInfo)
|
||||||
}
|
}
|
||||||
return &ml, err
|
return &ml, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func DiguiMenuLable(menulist *[]Menu, menu MenuLable) MenuLable {
|
func MenuLabelCall(menulist *[]Menu, menu MenuLable) MenuLable {
|
||||||
list := *menulist
|
list := *menulist
|
||||||
|
|
||||||
min := make([]MenuLable, 0)
|
min := make([]MenuLable, 0)
|
||||||
@@ -178,27 +178,31 @@ func DiguiMenuLable(menulist *[]Menu, menu MenuLable) MenuLable {
|
|||||||
mi.Label = list[j].Title
|
mi.Label = list[j].Title
|
||||||
mi.Children = []MenuLable{}
|
mi.Children = []MenuLable{}
|
||||||
if list[j].MenuType != "F" {
|
if list[j].MenuType != "F" {
|
||||||
ms := DiguiMenuLable(menulist, mi)
|
ms := MenuLabelCall(menulist, mi)
|
||||||
min = append(min, ms)
|
min = append(min, ms)
|
||||||
} else {
|
} else {
|
||||||
min = append(min, mi)
|
min = append(min, mi)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
menu.Children = min
|
if len(min) > 0 {
|
||||||
|
menu.Children = min
|
||||||
|
} else {
|
||||||
|
menu.Children = nil
|
||||||
|
}
|
||||||
return menu
|
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)
|
m = make([]Menu, 0)
|
||||||
for i := 0; i < len(menulist); i++ {
|
for i := 0; i < len(menus); i++ {
|
||||||
if menulist[i].ParentId != 0 {
|
if menus[i].ParentId != 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
menusInfo := DiguiMenu(&menulist, menulist[i])
|
menusInfo := DiguiMenu(&menus, menus[i])
|
||||||
|
|
||||||
m = append(m, menusInfo)
|
m = append(m, menusInfo)
|
||||||
}
|
}
|
||||||
@@ -216,14 +220,14 @@ func (e *MenuRole) Get() (Menus []MenuRole, err error) {
|
|||||||
return
|
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
|
var table *gorm.DB
|
||||||
if rolename == "admin" {
|
if roleName == "admin" {
|
||||||
table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*")
|
table = orm.Eloquent.Table(e.TableName()).Select("sys_menu.*")
|
||||||
table = table.Where(" menu_type in ('M','C')")
|
table = table.Where(" menu_type in ('M','C')")
|
||||||
} else {
|
} 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 = 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 {
|
if err = table.Order("sort").Find(&Menus).Error; err != nil {
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -88,6 +88,21 @@ func (role *SysRole) Get() (SysRole SysRole, err error) {
|
|||||||
return
|
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) {
|
func (role *SysRole) GetList() (SysRole []SysRole, err error) {
|
||||||
table := orm.Eloquent.Table("sys_role")
|
table := orm.Eloquent.Table("sys_role")
|
||||||
if role.RoleId != 0 {
|
if role.RoleId != 0 {
|
||||||
@@ -107,7 +122,12 @@ func (role *SysRole) GetList() (SysRole []SysRole, err error) {
|
|||||||
func (role *SysRole) GetRoleMeunId() ([]int, error) {
|
func (role *SysRole) GetRoleMeunId() ([]int, error) {
|
||||||
menuIds := make([]int, 0)
|
menuIds := make([]int, 0)
|
||||||
menuList := make([]MenuIdList, 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
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user