Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/organization/manage/OrganizationManage.java

@@ -166,32 +166,50 @@ public class OrganizationManage {
             return keyTreeVO;
         }).collect(Collectors.toList());
 
-        if (needMember && orgKeyTreeVOList.size() > 0) {
-            List<String> organizationCodeList = orgKeyTreeVOList.stream()
-                    .map(KeyTreeVO::getKey).collect(Collectors.toList());
+        if (StringUtils.isNotBlank(parentCode) && !needMember){
             List<DingEmployeeInfo> dingEmployeeInfoList = iDingEmployeeInfoService.list(Wrappers.lambdaQuery(DingEmployeeInfo.class)
                     .eq(DingEmployeeInfo::getMainJob, "true")
-                    .in(DingEmployeeInfo::getOrganizationCode, organizationCodeList));
-
-            Map<String, List<DingEmployeeInfo>> organizationCodeGroupMap = dingEmployeeInfoList.stream()
-                    .collect(Collectors.groupingBy(DingEmployeeInfo::getOrganizationCode));
+                    .eq(DingEmployeeInfo::getOrganizationCode, parentCode));
+
+            List<KeyTreeVO> memberChildren = dingEmployeeInfoList.stream().map(r -> {
+                KeyTreeVO child = new KeyTreeVO();
+                child.setKey(r.getEmployeeCode());
+                child.setTitle(r.getEmployeeName());
+                child.setType("MEMBER");
+                return child;
+            }).collect(Collectors.toList());
 
-            for (KeyTreeVO keyTreeVO : orgKeyTreeVOList) {
-                String organizationCode = keyTreeVO.getKey();
-                List<DingEmployeeInfo> dingEmployeeInfoGroupList = organizationCodeGroupMap.get(organizationCode);
-                if (CollUtil.isNotEmpty(dingEmployeeInfoGroupList)) {
-                    List<KeyTreeVO> memberChildren = dingEmployeeInfoGroupList.stream().map(r -> {
-                        KeyTreeVO child = new KeyTreeVO();
-                        child.setKey(r.getEmployeeCode());
-                        child.setTitle(r.getEmployeeName());
-                        child.setType("MEMBER");
-                        return child;
-                    }).collect(Collectors.toList());
-                    keyTreeVO.setChildren(memberChildren);
-                }
+            if (CollUtil.isNotEmpty(memberChildren)) {
+                orgKeyTreeVOList.addAll(memberChildren);
             }
         }
 
+//        if (needMember && orgKeyTreeVOList.size() > 0) {
+//            List<String> organizationCodeList = orgKeyTreeVOList.stream()
+//                    .map(KeyTreeVO::getKey).collect(Collectors.toList());
+//            List<DingEmployeeInfo> dingEmployeeInfoList = iDingEmployeeInfoService.list(Wrappers.lambdaQuery(DingEmployeeInfo.class)
+//                    .eq(DingEmployeeInfo::getMainJob, "true")
+//                    .in(DingEmployeeInfo::getOrganizationCode, organizationCodeList));
+//
+//            Map<String, List<DingEmployeeInfo>> organizationCodeGroupMap = dingEmployeeInfoList.stream()
+//                    .collect(Collectors.groupingBy(DingEmployeeInfo::getOrganizationCode));
+//
+//            for (KeyTreeVO keyTreeVO : orgKeyTreeVOList) {
+//                String organizationCode = keyTreeVO.getKey();
+//                List<DingEmployeeInfo> dingEmployeeInfoGroupList = organizationCodeGroupMap.get(organizationCode);
+//                if (CollUtil.isNotEmpty(dingEmployeeInfoGroupList)) {
+//                    List<KeyTreeVO> memberChildren = dingEmployeeInfoGroupList.stream().map(r -> {
+//                        KeyTreeVO child = new KeyTreeVO();
+//                        child.setKey(r.getEmployeeCode());
+//                        child.setTitle(r.getEmployeeName());
+//                        child.setType("MEMBER");
+//                        return child;
+//                    }).collect(Collectors.toList());
+//                    keyTreeVO.setChildren(memberChildren);
+//                }
+//            }
+//        }
+
         return orgKeyTreeVOList;
     }
 }