根组织不修改areaCode

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

@@ -155,28 +155,29 @@ public class AgencyServiceImpl implements AgencyService {
         if (StringUtils.isNotBlank(formDTO.getAreaCode()) && !formDTO.getAreaCode().equals(originalEntity.getAreaCode())) {
             //如果修改了areaCode。
             customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(), originalEntity.getAreaCode(), formDTO.getUserId());
-        }
+
-        //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
+            //判断areaCodeSwitch：open: 选择地区编码必填；closed:  无需选择地区编码
-        if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
+            if (CustomerAgencyConstant.AREA_CODE_SWITCH_OPEN.equals(formDTO.getAreaCodeSwitch())) {
-            //校验areaCode是否被使用过
+                //校验areaCode是否被使用过
-            if (!"other".equals(formDTO.getAreaCode())) {
+                if (!"other".equals(formDTO.getAreaCode())) {
-                List<String> agencyIds = customerAgencyDao.selectAgencyIdsByAreaCode(formDTO.getAreaCode(),formDTO.getAgencyId());
+                    List<String> agencyIds = customerAgencyDao.selectAgencyIdsByAreaCode(formDTO.getAreaCode(),formDTO.getAgencyId());
-                if (CollectionUtils.isNotEmpty(agencyIds)) {
+                    if (CollectionUtils.isNotEmpty(agencyIds)) {
-                    //已经被占用，提示
+                        //已经被占用，提示
-                    throw new RenException(EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getCode(), EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getMsg());
+                        throw new RenException(EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getCode(), EpmetErrorCode.AREA_CODE_ALREADY_EXISTS.getMsg());
-                }
+                    }
-                originalEntity.setAreaCode(formDTO.getAreaCode());
+                    originalEntity.setAreaCode(formDTO.getAreaCode());
-            }else{
+                }else{
-                //如果选择的是other,需要自定义一个编码
+                    //如果选择的是other,需要自定义一个编码
-                AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
+                    AddAreaCodeFormDTO addAreaCodeFormDTO = new AddAreaCodeFormDTO();
-                addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
+                    addAreaCodeFormDTO.setCurrentAreaLevel(formDTO.getLevel());
-                addAreaCodeFormDTO.setParentAreaCode(formDTO.getAreaCode());
+                    addAreaCodeFormDTO.setParentAreaCode(formDTO.getAreaCode());
-                addAreaCodeFormDTO.setName(formDTO.getAgencyName());
+                    addAreaCodeFormDTO.setName(formDTO.getAgencyName());
-                Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
+                    Result<String> addAreaCodeResult = epmetCommonServiceOpenFeignClient.addAreaCode(addAreaCodeFormDTO);
-                if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
+                    if (!addAreaCodeResult.success() || StringUtils.isBlank(addAreaCodeResult.getData())) {
-                    throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+                        throw new RenException("自定义area_code异常" + addAreaCodeResult.getInternalMsg());
+                    }
+                    originalEntity.setAreaCode(addAreaCodeResult.getData());
                 }
-                originalEntity.setAreaCode(addAreaCodeResult.getData());
             }
         }