|
@@ -48,6 +48,7 @@ import java.io.FileOutputStream;
|
|
import java.io.OutputStream;
|
|
import java.io.OutputStream;
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
+import java.util.function.Function;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -603,14 +604,17 @@ public class SysController {
|
|
newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
|
|
newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- Set<SysOrg> newSysOrgSet = newSysOrgList.stream().filter(s -> s.getType() == OrgTypeEnum.COLLEGE).collect(Collectors.toSet());
|
|
|
|
- dictionaryResultList = newSysOrgSet.stream().map(e -> {
|
|
|
|
|
|
+ newSysOrgList = newSysOrgList.stream().filter(s -> s.getType() == OrgTypeEnum.COLLEGE).collect(Collectors.toList());
|
|
|
|
+ Map<Long, SysOrg> sysOrgMap = newSysOrgList.stream().collect(Collectors.toMap(SysOrg::getId, Function.identity(), (dto1, dto2) -> dto1));
|
|
|
|
+
|
|
|
|
+ List<DictionaryResult> finalDictionaryResultList = dictionaryResultList;
|
|
|
|
+ sysOrgMap.forEach((k, v) -> {
|
|
DictionaryResult dictionaryResult = new DictionaryResult();
|
|
DictionaryResult dictionaryResult = new DictionaryResult();
|
|
- dictionaryResult.setId(e.getId());
|
|
|
|
- dictionaryResult.setCode(e.getCode());
|
|
|
|
- dictionaryResult.setName(e.getName());
|
|
|
|
- return dictionaryResult;
|
|
|
|
- }).collect(Collectors.toList());
|
|
|
|
|
|
+ dictionaryResult.setId(v.getId());
|
|
|
|
+ dictionaryResult.setCode(v.getCode());
|
|
|
|
+ dictionaryResult.setName(v.getName());
|
|
|
|
+ finalDictionaryResultList.add(dictionaryResult);
|
|
|
|
+ });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|