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

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -916,8 +916,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		for(String gridId:gridIdList){
 			GroupProcessingCountResultDTO resultDTO=new GroupProcessingCountResultDTO();
 			resultDTO.setGridId(gridId);
-			Integer auditingCreateGroupCount=resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId);
-			Integer auditingGroupEditRecordCount=groupEditSubmitRecordDao.selectCountAuditingRec(gridId);
+			Integer auditingCreateGroupCount=Optional.ofNullable(resiGroupRedis.getWorkGrassrootsGroupRedDotValue(gridId)).orElse(NumConstant.ZERO);
+			Integer auditingGroupEditRecordCount=Optional.ofNullable(groupEditSubmitRecordDao.selectCountAuditingRec(gridId)).orElse(NumConstant.ZERO);
 			Integer auditingCount=auditingCreateGroupCount+auditingGroupEditRecordCount;
 			if (null == auditingCount) {
 				resultDTO.setCount(0);

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

@@ -423,7 +423,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 		resiPartyMemberRedis.subtractWorkGrassrootsResiRedDotValue(entity.getGridId());
 		//5:更新这个人注册热心居民的网格下的所在的组的热心居民数信息
 		ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO();
-		identityParam.setUserId(formDTO.getUserId());
+		identityParam.setUserId(entity.getUserId());
 		identityParam.setGridId(entity.getGridId());
 		identityParam.setWarmFlag(NumConstant.ONE_STR);
 		resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);