作者 yangfu

Merge branch 'dev' into test

@@ -43,7 +43,8 @@ func (l *SystemUserAccountSearchLogic) SystemUserAccountSearch(req *types.System @@ -43,7 +43,8 @@ func (l *SystemUserAccountSearchLogic) SystemUserAccountSearch(req *types.System
43 WithKV("roleId", req.RoleId). 43 WithKV("roleId", req.RoleId).
44 WithKV("enable", req.Enable). 44 WithKV("enable", req.Enable).
45 WithKV("beginTime", req.BeginTime). 45 WithKV("beginTime", req.BeginTime).
46 - WithKV("endTime", req.EndTime) 46 + WithKV("endTime", req.EndTime).
  47 + WithKV("auditStatus", []int{domain.UserAuditStatusPassed})
47 if total, users, err = l.svcCtx.UserRepository.Find(l.ctx, conn, queryOptions); err != nil { 48 if total, users, err = l.svcCtx.UserRepository.Find(l.ctx, conn, queryOptions); err != nil {
48 return nil, xerr.NewErr(err) 49 return nil, xerr.NewErr(err)
49 } 50 }
@@ -41,7 +41,8 @@ func (l *SystemUserSearchLogic) SystemUserSearch(req *types.SystemUserSearchRequ @@ -41,7 +41,8 @@ func (l *SystemUserSearchLogic) SystemUserSearch(req *types.SystemUserSearchRequ
41 WithKV("likePhone", req.Phone). 41 WithKV("likePhone", req.Phone).
42 WithKV("position", req.Position). 42 WithKV("position", req.Position).
43 WithKV("enable", req.Enable). 43 WithKV("enable", req.Enable).
44 - WithKV("departmentId", req.DepartmentId) 44 + WithKV("departmentId", req.DepartmentId).
  45 + WithKV("auditStatus", []int{domain.UserAuditStatusPassed})
45 if total, users, err = l.svcCtx.UserRepository.Find(l.ctx, conn, queryOptions); err != nil { 46 if total, users, err = l.svcCtx.UserRepository.Find(l.ctx, conn, queryOptions); err != nil {
46 return nil, xerr.NewErr(err) 47 return nil, xerr.NewErr(err)
47 } 48 }