|
@@ -102,8 +102,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
wrapper.eq(SysUser::getStatus, 1);
|
|
wrapper.eq(SysUser::getStatus, 1);
|
|
|
wrapper.likeRight(StringUtils.isNotEmpty(sysPartnerPageDto.getDeptId()), SysUser::getId, sysPartnerPageDto.getDeptId());
|
|
wrapper.likeRight(StringUtils.isNotEmpty(sysPartnerPageDto.getDeptId()), SysUser::getId, sysPartnerPageDto.getDeptId());
|
|
|
wrapper.notLike(SysUser::getId, "M");
|
|
wrapper.notLike(SysUser::getId, "M");
|
|
|
- wrapper.notIn(SysUser::getId, stringList);
|
|
|
|
|
- wrapper.in(SysUser::getDeptId, idList);
|
|
|
|
|
|
|
+ wrapper.notIn(CollectionUtil.isNotEmpty(stringList),SysUser::getId, stringList);
|
|
|
|
|
+ wrapper.in(CollectionUtil.isNotEmpty(idList),SysUser::getDeptId, idList);
|
|
|
|
|
|
|
|
Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
|
|
Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
|
|
|
List<SysUser> records = insOrdersPage.getRecords();
|
|
List<SysUser> records = insOrdersPage.getRecords();
|