From be6c13e781f6fd2b7ea5df882854efac6433b916 Mon Sep 17 00:00:00 2001 From: ss <> Date: Sat, 12 Jul 2025 13:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8F=96=E6=96=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8A=A5=E9=94=99bug=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E4=BB=BB=E6=97=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=93=8D=E4=BD=9Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/internal/controller/admin/common/ems.go | 5 +++-- server/internal/controller/admin/common/sms.go | 5 +++-- server/internal/library/casbin/enforcer.go | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) 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)