Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -241,7 +241,7 @@ public class AgencyServiceImpl implements AgencyService {
     public List<AreaCodeDictResultDTO> areaCodeDictTree(AreaCodeDictFormDTO formDTO) {
         Result<List<AreaCodeDictResultDTO>> listResult = commonServiceOpenFeignClient.areaCodeDictTree(formDTO);
         if (!listResult.success()){
-            throw new RenException(ScreenConstant.GET_AREA_TREE_FAILURE);
+            throw new RenException(listResult.getInternalMsg());
         }
         if (!CollectionUtils.isEmpty(listResult.getData())){
             return listResult.getData();

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/constant/AreaCodeConstant.java

@@ -24,4 +24,6 @@ public interface AreaCodeConstant {
 
     String ROOT_AGENCY_LEVEL_IS_LEVEL = "RootAreaLevel为空......";
 
+    String LEVEL_ERROR = "RootAreaLevel填写错误【%s】";
+
 }

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/AreaCodeServiceImpl.java

@@ -313,6 +313,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
             tree = disposeAfterTwoLevel(formDTO);
         }else if (formDTO.getRootAreaLevel().equals(AreaCodeConstant.PROVINCE) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.CITY) || formDTO.getRootAreaLevel().equals(AreaCodeConstant.DISTRICT)){
             tree = disposeBeforeThreeLevelFinal(formDTO,tree);
+        }else {
+            throw new RenException(String.format(AreaCodeConstant.LEVEL_ERROR,formDTO.getRootAreaLevel()));
         }
         return tree;
     }