diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 880e07f357..5c720eee42 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/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 areaCodeDictTree(AreaCodeDictFormDTO formDTO) { Result> 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(); 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 742c73993a..3ee44fec5f 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 @@ -24,4 +24,6 @@ public interface AreaCodeConstant { String ROOT_AGENCY_LEVEL_IS_LEVEL = "RootAreaLevel为空......"; + String LEVEL_ERROR = "RootAreaLevel填写错误【%s】"; + } 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 7898516b33..b511cab2c0 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 @@ -313,6 +313,8 @@ public class AreaCodeServiceImpl extends BaseServiceImpl