Merge remote-tracking branch 'origin/dev_ic_mp' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -20,7 +20,6 @@ import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 import com.epmet.dataaggre.service.commonservice.AreaCodeService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.govorg.GovOrgService;
@@ -151,13 +150,14 @@ public class GovOrgServiceImpl implements GovOrgService {
         List<NextAreaCodeResultDTO> allList = areaCodeService.queryNextLevelAreaCodeList(formDTO);
         if (CollectionUtils.isNotEmpty(allList)) {
             //内部客户: 已经被使用过的areaCode
-            List<String> usedAreaCodeList1 = customerAgencyDao.selectUsedAreaCodeList(formDTO.getAreaCode());
+            // 组织编辑可以修改区域编码，所以不排除了，注释掉
+            // List<String> usedAreaCodeList1 = customerAgencyDao.selectUsedAreaCodeList(formDTO.getAreaCode());
             //外部子客户：
             List<String> usedAreaCodeList2 = customerRelation.selectUsedAreaCodeList(formDTO.getAreaCode());
             List<String> list=new ArrayList<>();
-            if(CollectionUtils.isNotEmpty(usedAreaCodeList1)){
+            /*if(CollectionUtils.isNotEmpty(usedAreaCodeList1)){
                 list.addAll(usedAreaCodeList1);
-            }
+            }*/
             if(CollectionUtils.isNotEmpty(usedAreaCodeList2)){
                 list.addAll(usedAreaCodeList2);
             }

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

@@ -152,31 +152,32 @@ public class AgencyServiceImpl implements AgencyService {
         originalEntity.setCode(formDTO.getCode());
         originalEntity.setContacts(formDTO.getContacts());
         originalEntity.setMobile(formDTO.getMobile());
-        if(StringUtils.isNotBlank(formDTO.getAreaCode())&&formDTO.getAreaCode().equals(originalEntity.getAreaCode())){
+        if (StringUtils.isNotBlank(formDTO.getAreaCode()) && !formDTO.getAreaCode().equals(originalEntity.getAreaCode())) {
             //如果修改了areaCode。
-            customerAgencyDao.updateSubAgencyAreaCode(originalEntity.getCustomerId(),originalEntity.getAreaCode(),formDTO.getUserId());
+            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());
             }
         }
 
@@ -314,19 +315,19 @@ public class AgencyServiceImpl implements AgencyService {
         if (null != entity && StringUtils.isNotBlank(entity.getAreaCode())) {
             switch (entity.getLevel()) {
                 case CustomerAgencyConstant.PROVINCE_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getProvince() ? StrConstant.EPMETY_STR : entity.getProvince());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getProvince()) ?  entity.getProvince():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.CITY_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getCity() ? StrConstant.EPMETY_STR : entity.getCity());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getCity()) ? entity.getCity():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.DISTRICT:
-                    agencysResultDTO.setAreaName(null == entity.getDistrict() ? StrConstant.EPMETY_STR : entity.getDistrict());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getDistrict()) ?  entity.getDistrict():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.STREET_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getStreet() ? StrConstant.EPMETY_STR : entity.getStreet());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getStreet()) ?  entity.getStreet():entity.getOrganizationName());
                     break;
                 case CustomerAgencyConstant.COMMUNITY_LEVEL:
-                    agencysResultDTO.setAreaName(null == entity.getCommunity() ? StrConstant.EPMETY_STR : entity.getCommunity());
+                    agencysResultDTO.setAreaName(StringUtils.isNotBlank(entity.getCommunity()) ? entity.getCommunity():entity.getOrganizationName());
                     break;
                 default:
                     agencysResultDTO.setAreaName(StrConstant.EPMETY_STR);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -735,7 +735,7 @@
         UPDATE customer_agency
         SET AREA_CODE = '',
         PARENT_AREA_CODE = '',
-        UPDATED_BY=#{operateUserId}
+        UPDATED_BY=#{operateUserId},
         UPDATED_TIME = NOW()
         WHERE
             DEL_FLAG = '0'