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

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);
             }