From 663f146cddb30aa2796f82c570638f060b4b416e Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 2 Sep 2022 14:50:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=AE=A4=E8=AF=81=E6=8F=90=E4=BA=A4=E6=97=B6?=
 =?UTF-8?q?=20=E8=87=AA=E5=8A=A8=E6=A0=A1=E9=AA=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=8E=BB=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=94=E5=8F=AA=E6=8C=89=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartyMemberConfirmServiceImpl.java   | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
index 961197076d..a980778c64 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
@@ -1,6 +1,7 @@
 package com.epmet.modules.partymember.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -21,6 +22,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.feign.ResiGroupFeignClient;
+import com.epmet.modules.partymember.dao.IcPartyMemberDao;
 import com.epmet.modules.partymember.entity.*;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
 import com.epmet.modules.partymember.service.*;
@@ -86,6 +88,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	private PartymemberAuthRecordService partymemberAuthRecordService;
 	@Autowired
 	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+	@Autowired
+	private IcPartyMemberDao icPartyMemberDao;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -191,8 +195,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		}
 
 		//获取党员基本信息(匹配)
-		PartymemberConfirmAutoDTO confirmAutoDTO =
-				partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO);
+		//PartymemberConfirmAutoDTO confirmAutoDTO = partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO);
+		PartymemberConfirmAutoDTO confirmAutoDTO = partyAuth(partyMemberInfoDTO);
 
 		//判断是否已注册居民，如果没有则注册居民
 		isResiRegister(partyMemberInfoDTO);
@@ -294,6 +298,30 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		return result;
 	}
 
+	/**
+	 * 居民点党员提交认证校验逻辑调整改查数字平台党员信息库，
+	 * 切只按身份证号查询
+	 */
+	public PartymemberConfirmAutoDTO partyAuth(PartymemberInfoDTO dto) {
+		PartymemberConfirmAutoDTO resultDTO = new PartymemberConfirmAutoDTO();
+		if (StringUtils.isBlank(dto.getIdCard())) {
+			resultDTO.setComparisonResults(false);
+			return resultDTO;
+		}
+		LambdaQueryWrapper<IcPartyMemberEntity> tWrapper = new LambdaQueryWrapper<>();
+		tWrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId());
+		tWrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard());
+		tWrapper.last("limit 1");
+		IcPartyMemberEntity entity = icPartyMemberDao.selectOne(tWrapper);
+		if (null == entity) {
+			resultDTO.setComparisonResults(false);
+			return resultDTO;
+		}
+		resultDTO.setComparisonResults(true);
+		resultDTO.setPatryMemberBaseInfoId(entity.getId());
+		return resultDTO;
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) {