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

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

@@ -425,16 +425,18 @@
 
     <select id="checkAgencyName" parameterType="map" resultType="com.epmet.entity.CustomerAgencyEntity">
         SELECT
-            ca.id
+        ca.id
         FROM
-            customer_agency ca
+        customer_agency ca
         WHERE
-            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>
+        ca.DEL_FLAG = '0'
+        AND ca.CUSTOMER_ID = #{customerId}
+        AND ca.ORGANIZATION_NAME = #{agencyName}
+        <if test='agencyId != "" and agencyId != null'>
+            AND ca.id !=#{agencyId}
+        </if>
+        <if test='parentAgencyId != "" and parentAgencyId != null'>
+            AND ca.pid =#{parentAgencyId}
+        </if>
     </select>
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -165,7 +165,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		//1:热心居民申请行为记录表新增数据
 		result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
 		if (!result.success()) {
-			logger.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+			logger.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
 		}
 		ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData();
 		//2:查询是否已申请热心居民(不查询审核未通过的)
@@ -191,7 +191,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		ResiWarmheartedFormDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED);
 		ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(ResiWarmheartedFormDTO);
 		if (null != resiWarmheartedApplyDTO) {
-			logger.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
+			logger.warn(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
 			throw new RenException(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
 		} else {
 			//0:调用user服务获取申请人的基本信息
@@ -408,17 +408,21 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		Result result = new Result();
 		//0:先校验数据是否是未审核状态，防止接口测试调用多次
 		ResiWarmheartedApplyEntity entity = baseDao.selectById(formDTO.getApplyId());
-		if (null == entity || !ResiWarmheartedVisitConstant.UNDER_AUDITTING.equals(entity.getAuditStatus())) {
-			logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.AUDIT_EXCEPTION));
+		if(null ==entity){
+			logger.warn(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,resi_warmhearted_apply is null",formDTO.getApplyId()));
 			throw new RenException(ResiWarmheartedVisitConstant.AUDIT_EXCEPTION);
 		}
+		if (!ResiWarmheartedVisitConstant.UNDER_AUDITTING.equals(entity.getAuditStatus())) {
+			logger.warn(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,audit_status is not under_auditting",formDTO.getApplyId()));
+			return new Result();
+		}
 		//1:更新热心居民申请表数据
 		//审核状态-通过
 		entity.setAuditStatus(PartyMemberConstant.APPROVED);
 		int num = baseDao.updateById(entity);
 		//2:审核通过的添加热心居民的角色
 		if (num < NumConstant.ONE) {
-			logger.error(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",ResiWarmheartedVisitConstant.UPDATE_EXCEPTION));
+			logger.warn(String.format("政府端-热心居民申请-审核通过错误,applyId=%s,错误提示:%s",formDTO.getApplyId(),ResiWarmheartedVisitConstant.UPDATE_EXCEPTION));
 			if (StrConstant.SPECIAL_CUSTOMER.equals(tokenDTO.getCustomerId())) {
 				throw new RenException("组长申请数据更新失败，组长角色添加失败");
 			} else {