diff --git a/server/internal/controller/admin/common/ems.go b/server/internal/controller/admin/common/ems.go index 37ae41c..9443f80 100644 --- a/server/internal/controller/admin/common/ems.go +++ b/server/internal/controller/admin/common/ems.go @@ -7,14 +7,15 @@ package common import ( "context" - "github.com/gogf/gf/v2/errors/gerror" - "github.com/gogf/gf/v2/frame/g" "hotgo/api/admin/common" "hotgo/internal/consts" + "hotgo/internal/dao" "hotgo/internal/library/contexts" "hotgo/internal/model/entity" "hotgo/internal/model/input/sysin" "hotgo/internal/service" + + "github.com/gogf/gf/v2/errors/gerror" ) var Ems = new(cEms) diff --git a/server/internal/controller/admin/common/sms.go b/server/internal/controller/admin/common/sms.go index 1964bb2..fe9968b 100644 --- a/server/internal/controller/admin/common/sms.go +++ b/server/internal/controller/admin/common/sms.go @@ -7,14 +7,15 @@ package common import ( "context" - "github.com/gogf/gf/v2/errors/gerror" - "github.com/gogf/gf/v2/frame/g" "hotgo/api/admin/common" "hotgo/internal/consts" + "hotgo/internal/dao" "hotgo/internal/library/contexts" "hotgo/internal/model/entity" "hotgo/internal/model/input/sysin" "hotgo/internal/service" + + "github.com/gogf/gf/v2/errors/gerror" ) var Sms = new(cSms) diff --git a/server/internal/library/casbin/enforcer.go b/server/internal/library/casbin/enforcer.go index c9ff2dd..fa06097 100644 --- a/server/internal/library/casbin/enforcer.go +++ b/server/internal/library/casbin/enforcer.go @@ -90,8 +90,8 @@ func loadPermissions(ctx context.Context) { Fields(q("r", dao.AdminRole.Columns().Key), q("m", dao.AdminMenu.Columns().Permissions)). Where(q("r", dao.AdminRole.Columns().Status), consts.StatusEnabled). Where(q("m", dao.AdminMenu.Columns().Status), consts.StatusEnabled). - Where(q("m", dao.AdminMenu.Columns().Permissions), ""). - Where(q("r", dao.AdminRole.Columns().Key), consts.SuperRoleKey). + WhereNot(q("m", dao.AdminMenu.Columns().Permissions), ""). + WhereNot(q("r", dao.AdminRole.Columns().Key), consts.SuperRoleKey). Scan(&polices) if err != nil { g.Log().Fatalf(ctx, "loadPermissions Scan err:%v", err)