From 4c0fceac73447f36e316f2441300adddc879aa03 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 19 Jul 2022 16:19:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/AgencyServiceImpl.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 79f33d949f..a97789712c 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
@@ -69,6 +69,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 机关单位信息
@@ -924,12 +926,14 @@ public class AgencyServiceImpl implements AgencyService {
     @Override
     public List<CustomerTreeDTO> getCustomerTree(TokenDto tokenDto) {
         List<CustomerTreeDTO> rootList = customerAgencyDao.selectRootCustomer(null, null);
+        List<CustomerTreeDTO> treeList = new ArrayList<>();
         Map<String, CustomerTreeDTO> treeMap = new HashMap<>();
         if (!rootList.isEmpty()) {
             // 获取已有客户的所有组织架构，并转换成map，保证唯一
             rootList.forEach(item -> {
-                customerHandle(item, treeMap);
+                customerHandle(item, treeList);
             });
+            treeMap = treeList.stream().collect(Collectors.toMap(CustomerTreeDTO::getAreaCode, Function.identity()));
             // 组合成组织树
             rootList = getCustomerTree(treeMap);
             // 回显客户名称
@@ -1008,11 +1012,11 @@ public class AgencyServiceImpl implements AgencyService {
      * @author zhy
      * @date 2022/7/6 13:54
      */
-    private void customerHandle(CustomerTreeDTO customer, Map<String, CustomerTreeDTO> treeMap) {
+    private void customerHandle(CustomerTreeDTO customer, List<CustomerTreeDTO> treeList) {
         Result<List<CustomerTreeDTO>> area = epmetCommonServiceOpenFeignClient.areaCodeTree(customer);
         if (area.success()) {
             if (area.getData() != null) {
-                area.getData().forEach(item -> treeMap.put(item.getAreaCode(), item));
+                treeList.addAll(area.getData());
             }
         }
     }