gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【sys】【user】更新查询用户条件拼接问题

pull/57/head
fengshuonan 2023-06-29 11:58:20 +08:00
parent cbfe1267e3
commit 1505f5107a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -451,19 +451,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 根据输入内容进行查询 // 根据输入内容进行查询
String searchText = sysUserRequest.getSearchText(); String searchText = sysUserRequest.getSearchText();
if (ObjectUtil.isNotEmpty(searchText)) { if (ObjectUtil.isNotEmpty(searchText)) {
queryWrapper.like(SysUser::getRealName, searchText); queryWrapper.nested(wrap -> {
queryWrapper.or().like(SysUser::getAccount, searchText); wrap.like(SysUser::getRealName, searchText);
queryWrapper.or().like(SysUser::getPhone, searchText); wrap.or().like(SysUser::getAccount, searchText);
queryWrapper.or().like(SysUser::getTel, searchText); wrap.or().like(SysUser::getPhone, searchText);
wrap.or().like(SysUser::getTel, searchText);
});
} }
// 根据状态进行查询 // 根据状态进行查询
Integer statusFlag = sysUserRequest.getStatusFlag(); Integer statusFlag = sysUserRequest.getStatusFlag();
queryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag); queryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag);
// 按用户排序字段排序
queryWrapper.orderByAsc(SysUser::getUserSort);
// 如果传递了组织机构id查询条件，则查询对应机构id下有哪些用户，再拼接用户查询条件 // 如果传递了组织机构id查询条件，则查询对应机构id下有哪些用户，再拼接用户查询条件
if (ObjectUtil.isNotEmpty(sysUserRequest.getOrgIdCondition())) { if (ObjectUtil.isNotEmpty(sysUserRequest.getOrgIdCondition())) {
List<Long> orgUserIdList = this.sysUserOrgService.getOrgUserIdList(sysUserRequest.getOrgIdCondition(), true); List<Long> orgUserIdList = this.sysUserOrgService.getOrgUserIdList(sysUserRequest.getOrgIdCondition(), true);
@ -474,9 +473,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
} else { } else {
queryWrapper.in(SysUser::getUserId, orgUserIdList); queryWrapper.in(SysUser::getUserId, orgUserIdList);
} }
} }
// 按用户排序字段排序
queryWrapper.orderByAsc(SysUser::getUserSort);
return queryWrapper; return queryWrapper;
} }