hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.qjit.cn/gfast-plugins/gfast-mandate

Browse Source
This commit is contained in:
yxh 2023-04-13 21:15:30 +08:00
commit d29c341034
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/app/system/logic/sysRole/sys_role.go
View File

@ -36,14 +36,15 @@ type sSysRole struct {
func (s *sSysRole) GetRoleListSearch(ctx context.Context, req *system.RoleListReq) (res *system.RoleListRes, err error) {
res = new(system.RoleListRes)
g.Try(ctx, func(ctx context.Context) {
err = g.Try(ctx, func(ctx context.Context) {
model := dao.SysRole.Ctx(ctx)
if req.RoleName != "" {
model = model.Where("name like ?", "%"+req.RoleName+"%")
model = model.Where("a.name like ?", "%"+req.RoleName+"%")
}
if req.Status != "" {
model = model.Where("status", gconv.Int(req.Status))
model = model.Where("a.status", gconv.Int(req.Status))
}
model = model.As("a")
res.Total, err = model.Count()
liberr.ErrIsNil(ctx, err, "获取角色数据失败")
if req.PageNum == 0 {
@ -53,7 +54,6 @@ func (s *sSysRole) GetRoleListSearch(ctx context.Context, req *system.RoleListRe
if req.PageSize == 0 {
req.PageSize = consts.PageSize
}
model = model.As("a")
model = model.LeftJoin("casbin_rule", "b", "b.v1 = a.id AND SUBSTR( b.v0, 1, 2 ) = 'u_' ")
model = model.Group("a.id")
err = model.Page(res.CurrentPage, req.PageSize).Order("id asc").Fields("a.*, count(b.v0) user_cnt").Scan(&res.List)