fix🐛: 修复菜单的目录(#500)
This commit is contained in:
1 parent
8b01126e0f
commit
41ff26edc8
1 file changed
+15
-2
@@ -2,7 +2,6 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
|
||||||
@@ -333,11 +332,25 @@ func (e *SysMenu) getByRoleName(roleName string) ([]models.SysMenu, error) {
|
|||||||
} else {
|
} else {
|
||||||
role.RoleKey = roleName
|
role.RoleKey = roleName
|
||||||
err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
|
err = e.Orm.Debug().Model(&role).Where("role_key = ? ", roleName).Preload("SysMenu", func(db *gorm.DB) *gorm.DB {
|
||||||
return db.Where(" menu_type in ('M','C')").Order("sort")
|
return db.Where(" menu_type in ('C')").Order("sort")
|
||||||
}).Find(&role).Error
|
}).Find(&role).Error
|
||||||
if role.SysMenu != nil {
|
if role.SysMenu != nil {
|
||||||
MenuList = *role.SysMenu
|
MenuList = *role.SysMenu
|
||||||
}
|
}
|
||||||
|
mIds := make([]int, 0)
|
||||||
|
for _, menu := range MenuList {
|
||||||
|
if menu.ParentId != 0 {
|
||||||
|
mIds = append(mIds, menu.ParentId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var data []models.SysMenu
|
||||||
|
err = e.Orm.Where(" menu_type in ('M') and menu_id in ?", mIds).Order("sort").Find(&data).Error
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, datum := range data {
|
||||||
|
MenuList = append(MenuList, datum)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in new issue
Block a user