From bb94ed8733c25cb5ecd2d7322efac905cebac906 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 8 Jan 2021 17:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=9C=B0=E5=8C=BA=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AreaCodeServiceImpl.java     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
index b05d8a6943..20f152de4a 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java
@@ -142,7 +142,9 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
      * @date 2021/1/8 上午8:57
      */
     public List<AreaCodeDictResultDTO> disposeTree(){
+        // 查询所有省市区
         List<AreaCodeDTO> areaCodeDTOS = baseDao.selectAllArea();
+        // 查询所有街道、社区
         List<AreaCodeChildDTO> areaCodeChildDTOS = childDao.selectAllChild();
         List<AreaCodeDictResultDTO> result = new ArrayList<>();
         List<AreaCodeDictResultDTO> fourResult = new ArrayList<>();
@@ -224,7 +226,15 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
     }
 
     /**
-     * @Description  根据节点获取组织区域树【遍历】，传参只能是 省，市，区级别
+     * @Description  根据节点获取组织区域树【遍历】，传参只能是 省，市，区级别 【暂时这样，循环太多了】
+     *
+     *
+     * 暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
+     *   ==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==
+     *     暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样==暂时这样
+     *
+     *
+     *
      * @Param tree
      * @Param rootAreaCode
      * @author zxc
@@ -253,6 +263,24 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
                                     result.add(threeChild);
                                     return result;
                                 }
+                                // 街道获取
+                                if (!CollectionUtils.isEmpty(threeChild.getChildren())){
+                                    for (AreaCodeDictResultDTO fourChild : threeChild.getChildren()) {
+                                        if (rootAreaCode.equals(fourChild.getCode())){
+                                            result.add(fourChild);
+                                            return result;
+                                        }
+                                        // 社区获取
+                                        if (!CollectionUtils.isEmpty(fourChild.getChildren())){
+                                            for (AreaCodeDictResultDTO fiveChild : fourChild.getChildren()) {
+                                                if (rootAreaCode.equals(fiveChild.getCode())){
+                                                    result.add(fiveChild);
+                                                    return result;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
                             }
                         }
                     }