From 65b9176e25f3fa8847ca33a5ca423d58206d14dd Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 12 Jan 2021 16:45:01 +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

---
 .../src/main/java/com/epmet/constant/AreaCodeConstant.java    | 2 ++
 .../main/java/com/epmet/service/impl/AreaCodeServiceImpl.java | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java
index c502a95e14..742c73993a 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java
@@ -22,4 +22,6 @@ public interface AreaCodeConstant {
     String STREET = "street";
     String COMMUNITY = "community";
 
+    String ROOT_AGENCY_LEVEL_IS_LEVEL = "RootAreaLevel为空......";
+
 }
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 aa1e3a0134..7898516b33 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
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -304,6 +305,9 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         if (StringUtils.isBlank(formDTO.getRootAreaCode())){
             return tree;
         }
+        if (StringUtils.isBlank(formDTO.getRootAreaLevel())){
+            throw new RenException(AreaCodeConstant.ROOT_AGENCY_LEVEL_IS_LEVEL);
+        }
         // 传参为街道-社区级
         if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.STREET) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.COMMUNITY)){
             tree = disposeAfterTwoLevel(formDTO);