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

【7.2.5】【user】更新用户下拉接口条件筛选

pull/37/head
fengshuonan 2022-09-19 11:14:30 +08:00
parent a9d59f24f8
commit 237c9b4b53
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -452,9 +452,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserRequest.setUserScopeIds(null); sysUserRequest.setUserScopeIds(null);
} }
// 如果是按部门数据划分 // 如果是按部门数据划分
else if (dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT) else if (dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT) || dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT_WITH_CHILD) || dataScopeTypeEnums.contains(DataScopeTypeEnum.DEFINE)) {
|| dataScopeTypeEnums.contains(DataScopeTypeEnum.DEPT_WITH_CHILD)
|| dataScopeTypeEnums.contains(DataScopeTypeEnum.DEFINE)) {
sysUserRequest.setScopeOrgIds(dataScopeOrganizationIds); sysUserRequest.setScopeOrgIds(dataScopeOrganizationIds);
sysUserRequest.setUserScopeIds(null); sysUserRequest.setUserScopeIds(null);
} }
@ -750,7 +748,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserLambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag); sysUserLambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(statusFlag), SysUser::getStatusFlag, statusFlag);
// 按条件查询的 // 按条件查询的
sysUserLambdaQueryWrapper.nested(ObjectUtil.isNotEmpty(condition), i -> i.like(SysUser::getRealName, condition).or(j -> j.like(SysUser::getAccount, condition))); sysUserLambdaQueryWrapper.nested(ObjectUtil.isNotEmpty(condition), i -> i.like(SysUser::getRealName, condition)
.or(j -> j.like(SysUser::getAccount, condition)));
List<SysUser> list = this.list(sysUserLambdaQueryWrapper); List<SysUser> list = this.list(sysUserLambdaQueryWrapper);
ArrayList<SimpleDict> results = new ArrayList<>(); ArrayList<SimpleDict> results = new ArrayList<>();
@ -1033,6 +1032,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getAccount()), SysUser::getAccount, sysUserRequest.getAccount()); queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getAccount()), SysUser::getAccount, sysUserRequest.getAccount());
queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getRealName()), SysUser::getRealName, sysUserRequest.getRealName()); queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getRealName()), SysUser::getRealName, sysUserRequest.getRealName());
// 根据text查询
if (ObjectUtil.isNotEmpty(sysUserRequest.getSearchText())) {
queryWrapper.like(SysUser::getAccount, sysUserRequest.getSearchText()).or().like(SysUser::getRealName, sysUserRequest.getSearchText()).or()
.like(SysUser::getNickName, sysUserRequest.getSearchText());
}
return queryWrapper; return queryWrapper;
} }