|
|
@@ -44,13 +44,13 @@ public class AppCustomerManagementImpl implements AppCustomerManagementService {
|
|
|
Page<SysUser> page = new Page<>(managementQueryVo.getPageNum(), managementQueryVo.getPageSize());
|
|
|
String userId = BaseController.getUserId();
|
|
|
if (OrganizationSource.OS_1.getCode().equals(dept.getManagementSource())) {
|
|
|
-
|
|
|
+ boolean notEmpty = StringUtils.isNotEmpty(managementQueryVo.getCriteria());
|
|
|
Page<SysUser> sysUserPage = sysUserService.lambdaQuery()
|
|
|
.eq(SysUser::getOperatorCode, userId)
|
|
|
- .or(x -> x.eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getMobile, managementQueryVo.getCriteria())
|
|
|
- .or().eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getId, managementQueryVo.getCriteria())
|
|
|
- .or().eq(StringUtils.isEmpty(managementQueryVo.getCriteria()), SysUser::getName, managementQueryVo.getCriteria()))
|
|
|
- .eq(StringUtils.isEmpty(managementQueryVo.getAuthenticationStatus()), SysUser::getStatus, managementQueryVo.getAuthenticationStatus())
|
|
|
+ .eq(StringUtils.isNotEmpty(managementQueryVo.getAuthenticationStatus()), SysUser::getStatus, managementQueryVo.getAuthenticationStatus())
|
|
|
+ .and(notEmpty, x -> x.eq(SysUser::getMobile, managementQueryVo.getCriteria())
|
|
|
+ .or().eq(SysUser::getId, managementQueryVo.getCriteria())
|
|
|
+ .or().eq(SysUser::getName, managementQueryVo.getCriteria()))
|
|
|
.page(page);
|
|
|
|
|
|
List<SysUserTeamDto> sysUserTeamDtos = sysUserPage.getRecords().stream().map(SysUserTeamDto::new).collect(Collectors.toList());
|