From d438a895c534b6487d5d3ccb4b9f86370f52f649 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 20 May 2020 19:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81-=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E8=AF=A6=E6=83=85bug=E4=BF=AE=E6=94=B9=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartyMemberConfirmServiceImpl.java   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 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 a5158f964a..5f92e709f8 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
@@ -448,22 +448,28 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setContactMobile(partyMemberInfo.getExtraCertifierMobile() == null ? "" : partyMemberInfo.getExtraCertifierMobile());
 		resultDTO.setContactPeople(partyMemberInfo.getExtraCertifierName() == null ? "" : partyMemberInfo.getExtraCertifierName());
 		List<String> failedReason = new ArrayList<>();
-		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) {
+		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()&&!("null").equals(fromDTO.getAutoId())) {
 			PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId());
-			if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) {
-				failedReason.add("手机号匹配");
-			} else {
+			if (null == autoEntity) {
 				failedReason.add("手机号未匹配");
-			}
-			if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) {
-				failedReason.add("身份证匹配");
-			} else {
 				failedReason.add("身份证未匹配");
-			}
-			if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) {
-				failedReason.add("姓名匹配");
-			} else {
 				failedReason.add("姓名未匹配");
+			} else {
+				if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) {
+					failedReason.add("手机号匹配");
+				} else {
+					failedReason.add("手机号未匹配");
+				}
+				if (PartyMemberConstant.SAME.equals(autoEntity.getIdCardResult())) {
+					failedReason.add("身份证匹配");
+				} else {
+					failedReason.add("身份证未匹配");
+				}
+				if (PartyMemberConstant.SAME.equals(autoEntity.getNameResult())) {
+					failedReason.add("姓名匹配");
+				} else {
+					failedReason.add("姓名未匹配");
+				}
 			}
 		} else {
 			failedReason.add("手机号未匹配");