FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化机构

Browse Source
This commit is contained in:
zhangjun
2022-09-20 22:55:54 +08:00
parent 7f3e07000c
commit 3bd92a4fa2
6 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
+23 -23
View File
@@ -460,29 +460,29 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
public IPage<TsUser> getAllUsers(TsUser tsUser) {
List<String> ids=new ArrayList<>();
ids.add(tsUser.getInstitutionId());
List<String> middle=new ArrayList<>();
middle.addAll(ids);
boolean flag=true;
while (flag){
QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
queryWrapper.in("parent_id",middle);
List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
if (tsmiddle.size()>0){
tsmiddle.forEach(tsInstitution -> {
middle.add(tsInstitution.getId());
});
middle.removeAll(ids);
ids.addAll(middle);
}else {
tsmiddle.forEach(tsInstitution -> {
middle.add(tsInstitution.getId());
});
middle.removeAll(ids);
ids.addAll(middle);
flag=false;
}
}
ids.removeIf(s -> null==s);
// List<String> middle=new ArrayList<>();
// middle.addAll(ids);
// boolean flag=true;
// while (flag){
// QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
// queryWrapper.in("parent_id",middle);
// List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
// if (tsmiddle.size()>0){
// tsmiddle.forEach(tsInstitution -> {
// middle.add(tsInstitution.getId());
// });
// middle.removeAll(ids);
// ids.addAll(middle);
// }else {
// tsmiddle.forEach(tsInstitution -> {
// middle.add(tsInstitution.getId());
// });
// middle.removeAll(ids);
// ids.addAll(middle);
// flag=false;
// }
// }
// ids.removeIf(s -> null==s);
Page<TsUser> tsUserPage = new Page<>();
tsUserPage.setCurrent(tsUser.getCurrent());
tsUserPage.setSize(tsUser.getSize());