fix🐛: 修复获取菜单接口menurole,数据不完整 (#676)
This commit is contained in:
1 parent
98c495abb1
commit
86187e4c79
1 file changed
+29
-38
@@ -1,8 +1,8 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
|
"github.com/pkg/errors"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
@@ -334,55 +334,46 @@ func (e *SysMenu) SetMenuRole(roleName string) (m []models.SysMenu, err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) {
|
func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) {
|
||||||
var MenuList []models.SysMenu
|
|
||||||
var role models.SysRole
|
var role models.SysRole
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
if roleName == "admin" {
|
if roleName == "admin" {
|
||||||
var data []models.SysMenu
|
var data []models.SysMenu
|
||||||
err = e.Orm.Where(" menu_type in ('M','C')").Order("sort").Find(&data).Error
|
err = e.Orm.Where(" menu_type in ('M','C') and deleted_at is null and created_at>'2021-08-13'").
|
||||||
MenuList = data
|
Order("sort").
|
||||||
|
Find(&data).
|
||||||
|
Error
|
||||||
|
err = errors.WithStack(err)
|
||||||
|
return data, err
|
||||||
} else {
|
} else {
|
||||||
role.RoleKey = roleName
|
role.RoleKey = roleName
|
||||||
buttons := make([]models.SysMenu, 0)
|
err = e.Orm.
|
||||||
err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
|
Model(&role).
|
||||||
return db.Where(" menu_type in ('F')").Order("sort")
|
Where("role_key = ? ", roleName).
|
||||||
}).Find(&role).Error
|
Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
|
||||||
if role.SysMenu != nil {
|
return db.Where(" menu_type in ('F','C')").Order("sort")
|
||||||
buttons = *role.SysMenu
|
}).
|
||||||
}
|
Find(&role).Error
|
||||||
mIds := make([]int, 0)
|
MenuList := *role.SysMenu
|
||||||
for _, menu := range buttons {
|
mIds := make([]string, 0)
|
||||||
if menu.ParentId != 0 {
|
mp := make(map[string]string, 0)
|
||||||
mIds = append(mIds, menu.ParentId)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var dataC []models.SysMenu
|
|
||||||
err = e.Orm.Where(" menu_type in ('C') and menu_id in ?", mIds).Order("sort").Find(&dataC).Error
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
for _, datum := range dataC {
|
|
||||||
MenuList = append(MenuList, datum)
|
|
||||||
}
|
|
||||||
cIds := make([]int, 0)
|
|
||||||
for _, menu := range MenuList {
|
for _, menu := range MenuList {
|
||||||
if menu.ParentId != 0 {
|
ids := strings.Split(menu.Paths, "/")
|
||||||
cIds = append(cIds, menu.ParentId)
|
for _, id := range ids {
|
||||||
|
if mp[id] == "" {
|
||||||
|
mp[id] = id
|
||||||
|
mIds = append(mIds, id)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var dataM []models.SysMenu
|
}
|
||||||
err = e.Orm.Where(" menu_type in ('M') and menu_id in ?", cIds).Order("sort").Find(&dataM).Error
|
var data []models.SysMenu
|
||||||
|
err = e.Orm.Where(" menu_id in ? and menu_type in ('M','C')", mIds).
|
||||||
|
Order("sort").
|
||||||
|
Find(&data).
|
||||||
|
Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
for _, datum := range dataM {
|
return data, err
|
||||||
MenuList = append(MenuList, datum)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
e.Log.Errorf("db error:%s", err)
|
|
||||||
}
|
|
||||||
return MenuList, err
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user