From abc71d929973b5a03cf1a25b34362507aea42aa0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 19 Jul 2022 14:16:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/AgencyServiceImpl.java | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index db30887818..e7d27a946a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -67,10 +67,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 机关单位信息
@@ -926,11 +923,15 @@ public class AgencyServiceImpl implements AgencyService {
     @Override
     public List<CustomerTreeDTO> getCustomerTree(TokenDto tokenDto) {
         List<CustomerTreeDTO> rootList = customerAgencyDao.selectRootCustomer();
+        Map<String, CustomerTreeDTO> treeMap = new HashMap<>();
         if (!rootList.isEmpty()) {
-            rootList.forEach(this::getSubCustomer);
+            rootList.forEach(item -> {
+                getSubCustomer(item, treeMap);
+            });
         }
         return rootList;
     }
+
     private CustomerAgencyEntity constructInsertEntity(AddAgencyV2FormDTO formDTO, CustomerAgencyDTO parent) {
         CustomerAgencyEntity insertEntity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class);
         insertEntity.setOrganizationName(formDTO.getAgencyName());
@@ -988,22 +989,16 @@ public class AgencyServiceImpl implements AgencyService {
      * @author zhy
      * @date 2022/7/6 13:54
      */
-    private CustomerRelationTreeDTO getSubCustomer(CustomerTreeDTO customer) {
-        AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO();
-        formDTO.setAreaCode(customer.getAreaCode());
-        formDTO.setLevel(customer.getLevel());
-        Result<AreaCodeResultDTO> area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO);
+    private void getSubCustomer(CustomerTreeDTO customer,Map<String, CustomerTreeDTO> treeMap) {
+
+        Result<List<CustomerTreeDTO>> area = epmetCommonServiceOpenFeignClient.areaCodeTree(customer);
         if (area.success()) {
             if (area.getData() != null) {
-                customer.setAreaName(area.getData().getAreaName());
+                area.getData().forEach(item->{
+                    treeMap.put(item.getAreaCode(),item);
+                });
             }
         }
-        List<CustomerTreeDTO> children = baseDao.selectSubCustomerByPid(customer.getCustomerId());
-        customer.setChildren(children);
-        if (!children.isEmpty()) {
-            children.forEach(this::getSubCustomer);
-        }
-        return customer;
     }
 
 }