Merge remote-tracking branch 'origin/dev_0519yzm' into dev_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -99,7 +99,7 @@ public class AgencyController {
             ValidatorUtils.validateEntity(formDTO, AddAgencyV2FormDTO.AreaCodeGroup.class);
         }
         //当前客户下，同级组织中，组织名称不允许重复
-        customerAgencyService.checkAgencyName(formDTO.getAgencyName(),tokenDTO.getCustomerId(),formDTO.getLevel(),null);
+        customerAgencyService.checkAgencyName(formDTO.getAgencyName(),tokenDTO.getCustomerId(),null,formDTO.getParentAgencyId());
         return new Result<AddAgencyResultDTO>().ok(agencyService.addAgencyV2(formDTO));
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -231,6 +231,6 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
 
     List<CustomerAgencyEntity> checkAgencyName(@Param("agencyName") String agencyName,
                                                @Param("customerId") String customerId,
-                                               @Param("level") String level,
-                                               @Param("agencyId") String agencyId);
+                                               @Param("agencyId") String agencyId,
+                                               @Param("parentAgencyId") String parentAgencyId);
 }

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

@@ -235,5 +235,5 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      **/
     OrganizeTreeResultDTO organizeTree(String agencyId);
 
-    void checkAgencyName(String agencyName,String customerId,String level,String agencyId);
+    void checkAgencyName(String agencyName,String customerId,String agencyId,String parentAgencyId);
 }

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

@@ -134,7 +134,7 @@ public class AgencyServiceImpl implements AgencyService {
         Result result = new Result();
         CustomerAgencyEntity originalEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
         //当前客户下，同级组织中，组织名称不允许重复
-        customerAgencyService.checkAgencyName(formDTO.getAgencyName(),originalEntity.getCustomerId(),originalEntity.getLevel(),originalEntity.getId());
+        customerAgencyService.checkAgencyName(formDTO.getAgencyName(),originalEntity.getCustomerId(),originalEntity.getId(),originalEntity.getPid());
         originalEntity.setOrganizationName(formDTO.getAgencyName());
         //1:更新当前组织信息
         if (customerAgencyDao.updateById(originalEntity) < NumConstant.ONE) {

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

@@ -1060,8 +1060,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     }
 
     @Override
-    public void checkAgencyName(String agencyName,String customerId,String level,String agencyId) {
-        List<CustomerAgencyEntity> entityList = baseDao.checkAgencyName(agencyName,customerId,level,agencyId);
+    public void checkAgencyName(String agencyName,String customerId,String agencyId,String parentAgencyId) {
+        List<CustomerAgencyEntity> entityList = baseDao.checkAgencyName(agencyName,customerId,agencyId,parentAgencyId);
         if (CollectionUtils.isNotEmpty(entityList)) {
             throw new RenException(EpmetErrorCode.AGENCY_NAME_ALREADY_EXISTS.getCode(), EpmetErrorCode.AGENCY_NAME_ALREADY_EXISTS.getMsg());
         }

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

@@ -432,9 +432,11 @@
             ca.DEL_FLAG = '0'
             AND ca.CUSTOMER_ID = #{customerId}
             AND ca.ORGANIZATION_NAME = #{agencyName}
-            AND ca.`LEVEL` = #{level}
             <if test='agencyId != "" and agencyId != null'>
                 AND ca.id !=#{agencyId}
             </if>
+            <if test='parentAgencyId != "" and parentAgencyId != null'>
+                AND ca.pid =#{parentAgencyId}
+            </if>
     </select>
 </mapper>