|
|
@@ -80,11 +80,6 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
@Override
|
|
|
public BasePageResult<SysUserPartner> queryByPage(SysPartnerPageDto sysPartnerPageDto) {
|
|
|
Page<SysUser> page = new Page<>(sysPartnerPageDto.getPageNum(), sysPartnerPageDto.getPageSize());
|
|
|
- //查询所有四级部门
|
|
|
-// List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>()
|
|
|
-// .eq(SysDept::getComlevel, 5).eq(SysDept::getDelFlag,0));
|
|
|
-// List<String> idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
|
|
|
-
|
|
|
LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(SysUser::getStatus, 1);
|
|
|
wrapper.likeRight(StringUtils.isNotEmpty(sysPartnerPageDto.getDeptId()), SysUser::getId, sysPartnerPageDto.getDeptId());
|
|
|
@@ -98,11 +93,11 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
records = records.stream().filter(SysUser -> !stringList.contains(SysUser.getId())).collect(Collectors.toList());
|
|
|
}
|
|
|
// //查询所有四级部门
|
|
|
- List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getComlevel, 5));
|
|
|
- List<String> idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
|
|
|
- if (records.size()>0) {
|
|
|
- records = records.stream().filter(SysUser -> !idList.contains(SysUser.getId())).collect(Collectors.toList());
|
|
|
- }
|
|
|
+// List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getComlevel, 5));
|
|
|
+// List<String> idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
|
|
|
+// if (records.size()>0) {
|
|
|
+// records = records.stream().filter(SysUser -> !idList.contains(SysUser.getId())).collect(Collectors.toList());
|
|
|
+// }
|
|
|
|
|
|
List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);
|
|
|
|