bug

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -934,21 +934,21 @@ public class AgencyServiceImpl implements AgencyService {
             rootList.forEach(item -> {
                 customerHandle(item, treeList);
             });
-            treeMap = treeList.stream().collect(Collectors.toMap(CustomerTreeDTO::getAreaCode, Function.identity(), (val1, val2) -> val2));
+//            treeMap = treeList.stream().collect(Collectors.toMap(CustomerTreeDTO::getAreaCode, Function.identity(), (val1, val2) -> val2));
             // 组合成组织树
             rootList = getCustomerTree(treeList);
             // 回显客户名称
             rootList.forEach(item -> {
                 List<String> customerNames = new ArrayList<>();
                 List<CustomerTreeDTO> subList = customerAgencyDao.selectRootCustomer(item.getAreaCode(), item.getLevel());
-                if (!subList.isEmpty()) {
+                subList.forEach(customer -> {
                     CustomerDTO customerDTO = new CustomerDTO();
-                    customerDTO.setId(item.getCustomerId());
+                    customerDTO.setId(customer.getCustomerId());
                     Result<CustomerDTO> customerResult = operCrmFeignClient.getCustomerInfo(customerDTO);
                     if (customerResult.success() && null != customerResult.getData()) {
                         customerNames.add(customerResult.getData().getCustomerName());
                     }
-                }
+                });
                 item.setCustomerName(Joiner.on(",").join(customerNames));
             });
         }
@@ -1027,7 +1027,7 @@ public class AgencyServiceImpl implements AgencyService {
      *
      * @param
      * @return com.epmet.dto.result.CustomerTreeDTO
-     * @author zhy
+     * @author wgf
      * @date 2022/7/6 13:54
      */
     private List<CustomerTreeDTO> getCustomerTree(List<CustomerTreeDTO> treeList) {
@@ -1080,6 +1080,7 @@ public class AgencyServiceImpl implements AgencyService {
 
     /**
      * 组装子项
+     *
      * @param parentDto
      * @param childList
      */