wangliang 3 éve
szülő
commit
7c7765ca56

+ 6 - 3
distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java

@@ -604,9 +604,12 @@ public class SysController {
                                     newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
                                 }
                             }
-                            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));
-
+                            Map<Long, SysOrg> sysOrgMap = new LinkedHashMap<>();
+                            for (SysOrg s : newSysOrgList) {
+                                if (s.getType() == OrgTypeEnum.COLLEGE) {
+                                    sysOrgMap.put(s.getId(), s);
+                                }
+                            }
                             List<DictionaryResult> finalDictionaryResultList = dictionaryResultList;
                             sysOrgMap.forEach((k, v) -> {
                                 DictionaryResult dictionaryResult = new DictionaryResult();