Merge remote-tracking branch 'origin/dev'

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

@@ -25,6 +25,8 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -616,7 +618,7 @@ public class AreaCodeServiceImpl extends BaseServiceImpl<AreaCodeDao, AreaCodeEn
         //地区编码 同一级不允许重名
         List<AreaCodeChildDTO> list = childDao.selectByPCodeAndName(formDTO.getParentAreaCode().trim(), formDTO.getName().trim());
         if (CollUtil.isNotEmpty(list)) {
-            throw new RenException("name已存在");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "name已存在", "组织名称已存在");
         }
         AreaCodeChildDTO areaCodeChildDTO = new AreaCodeChildDTO();
         areaCodeChildDTO.setName(formDTO.getName().trim());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -193,8 +193,12 @@ public class AgencyServiceImpl implements AgencyService {
                     addAreaCodeFormDTO.setName(formDTO.getAgencyName());
                     Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
                     if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
+                        if (addAreaCodeResult.getCode() > 8000) {
+                            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+                        } else {
                             throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
                         }
+                    }
                     originalEntity.setAreaCode(addAreaCodeResult.getData());
                     originalEntity.setParentAreaCode(parent.getAreaCode());
                 }