fix

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -2,8 +2,10 @@ package com.gic.haoban.manage.web.controller;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
@@ -121,30 +123,35 @@ public class DepartmentContoller extends WebBaseController{
 			DepartmentDTO dto = departmentApiService.getRootByEnterpriseId(wxEnterpriseId);
 			list.add(dto);
 		}
+		Set<String> enterpriseSet = new HashSet<>();
 		for (DepartmentDTO departmentDTO : list) {
 			String relatedId = departmentDTO.getRelatedId();
 			if(StringUtils.isBlank(relatedId)){
 				departmentDTO.setBindFlag(0);
 			}else{
-				String gicEnterpriseName = "";
-				String gicEnterpriseId = "";
-				if(departmentDTO.getIsStore() == 1){
-					StoreDTO store = storeService.getStore(relatedId);
-					if(store != null){
-						gicEnterpriseId = store.getEnterpriseId();
-					}
-				}else{
-					StoreGroupDTO department = storeGroupService.getStoreGroupById(relatedId);
-					if(department != null){
-						gicEnterpriseId = department.getEnterpriseId();
-					}
-				}
-				EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(gicEnterpriseId);
+				String gicEnterpriseId = departmentDTO.getEnterpriseId();
+				enterpriseSet.add(gicEnterpriseId);
+				departmentDTO.setBindFlag(1);
+			}
+			
+			departmentDTO.setHasSonNode(departmentApiService.hasSonNode(departmentDTO.getDepartmentId()));
+		}
+		
+		Map<String,EnterpriseDTO> enterpriseMap = new HashMap<>();
+		for (String enterpriseId : enterpriseSet) {
+			EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
+			if(enterprise != null){
+				enterpriseMap.put(enterpriseId, enterprise);
+			}
+		}
+		
+		for (DepartmentDTO departmentDTO : list) {
+			String enterpriseId = departmentDTO.getEnterpriseId();
+			if(StringUtils.isNotBlank(enterpriseId)){
+				EnterpriseDTO enterprise = enterpriseMap.get(enterpriseId);
 				if(enterprise != null){
-					gicEnterpriseName = enterprise.getEnterpriseName();
+					departmentDTO.setGicEnterpriseName(enterprise.getEnterpriseName());
 				}
-				departmentDTO.setGicEnterpriseName(gicEnterpriseName);
-				departmentDTO.setBindFlag(1);
 			}
 			
 			departmentDTO.setHasSonNode(departmentApiService.hasSonNode(departmentDTO.getDepartmentId()));