Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -98,7 +98,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		// 获取党员认证信息，判断是否提交认证
 		PartymemberInfoDTO partyMemberInfoParam = new PartymemberInfoDTO();
 		partyMemberInfoParam.setCustomerId(fromDto.getCustomerId());
-		partyMemberInfoParam.setGridId(fromDto.getGridId());
+		//partyMemberInfoParam.setGridId(fromDto.getGridId());
 		partyMemberInfoParam.setUserId(fromDto.getUserId());
 		PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfo(partyMemberInfoParam);
 		// 若已提交，获取提交的党员信息

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -38,7 +38,6 @@
                 AND pcm.DEL_FLAG = 0
         WHERE
             pi.CUSTOMER_ID = #{customerId}
-          AND pi.GRID_ID = #{gridId}
           AND pi.USER_ID = #{userId}
           AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
           AND pi.DEL_FLAG = 0