This commit is contained in:
2025-07-11 02:21:12 +08:00
parent 347970eab4
commit 038d3a96a4
17592 changed files with 20 additions and 132349 deletions

View File

@@ -2,6 +2,7 @@ package service
import (
"context"
"fmt"
"blazing/cool"
@@ -45,8 +46,10 @@ func (s *BaseSysMenuService) GetPerms(roleIds []string) []string {
func (s *BaseSysMenuService) GetMenus(roleIds []string, isAdmin bool) (result gdb.Result) {
// 屏蔽 base_sys_role_menu.id 防止部分权限的用户登录时菜单渲染错误
m := cool.DBM(s.Model).As("a").Fields("a.*")
var err error
if isAdmin {
result, _ = m.Group("a.id").Order("a.orderNum asc").All()
result, err = m.Group("a.id").Order("a.orderNum", "asc").All()
fmt.Println(err)
} else {
result, _ = m.InnerJoin("base_sys_role_menu b", "a.id=b.menuId").Where("b.roleId IN (?)", roleIds).Group("a.id").Order("a.orderNum asc").All()
}