feat: 优化InAdmin

2637309949 · Dec 24, 2020 · 3dfef9c · 3dfef9c
1 parent 9345c9e
commit 3dfef9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/platform/app/app.ctx.go b/platform/app/app.ctx.go
@@ -74,8 +74,14 @@ func (ctx *Context) InRole(role ...string) bool {
 }
 
 // InAdmin defined
-func (ctx *Context) InAdmin() bool {
-	exit, _ := ctx.DB.Where(`role_id = ? and user_id = ?`, model.AdminRole.ID.String, ctx.GetToken().GetUserID()).Exist(new(model.SysRoleUser))
+func (ctx *Context) InAdmin(idn ...string) bool {
+	roles := []string{model.AdminRole.ID.String}
+	roles = append(roles, idn...)
+	exit, err := ctx.DB.In("role_id", roles).Where(`user_id = ? and del_flag != 1`, ctx.GetToken().GetUserID()).Exist(new(model.SysRoleUser))
+	if err != nil {
+		logrus.Error(err)
+		return false
+	}
 	return exit
 }
 

diff --git a/platform/app/sys_app_fun.go b/platform/app/sys_app_fun.go