diff --git a/features/sys_menu/service/service_sys_menu.go b/features/sys_menu/service/service_sys_menu.go index 3c71d17c..7ca1fd60 100644 --- a/features/sys_menu/service/service_sys_menu.go +++ b/features/sys_menu/service/service_sys_menu.go @@ -49,7 +49,17 @@ func (r *ServiceSysMenu) SelectMenuTreeByUserId(userId string) []model.SysMenu { // SelectMenuTreeSelectByUserId 根据用户ID查询菜单树结构信息 func (r *ServiceSysMenu) SelectMenuTreeSelectByUserId(sysMenu model.SysMenu, userId string) []vo.TreeSelect { sysMenus := r.sysMenuRepository.SelectMenuList(sysMenu, userId) - menus := r.parseDataToTree(sysMenus) + + // 过滤旧前端菜单 + sysMenusF := []model.SysMenu{} + for _, v := range sysMenus { + if v.Perms != "page" { + continue + } + sysMenusF = append(sysMenusF, v) + } + + menus := r.parseDataToTree(sysMenusF) tree := make([]vo.TreeSelect, 0) for _, menu := range menus { tree = append(tree, sysMenuTreeSelect(menu)) diff --git a/src/modules/system/service/sys_menu.impl.go b/src/modules/system/service/sys_menu.impl.go index 6d4d5c2b..f5165959 100644 --- a/src/modules/system/service/sys_menu.impl.go +++ b/src/modules/system/service/sys_menu.impl.go @@ -49,7 +49,17 @@ func (r *SysMenuImpl) SelectMenuTreeByUserId(userId string) []model.SysMenu { // SelectMenuTreeSelectByUserId 根据用户ID查询菜单树结构信息 func (r *SysMenuImpl) SelectMenuTreeSelectByUserId(sysMenu model.SysMenu, userId string) []vo.TreeSelect { sysMenus := r.sysMenuRepository.SelectMenuList(sysMenu, userId) - menus := r.parseDataToTree(sysMenus) + + // 过滤旧前端菜单 + sysMenusF := []model.SysMenu{} + for _, v := range sysMenus { + if v.Perms == "page" { + continue + } + sysMenusF = append(sysMenusF, v) + } + + menus := r.parseDataToTree(sysMenusF) tree := make([]vo.TreeSelect, 0) for _, menu := range menus { tree = append(tree, vo.SysMenuTreeSelect(menu))