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

---
 .../impl/PartyMemberConfirmServiceImpl.java   | 31 ++++++++++++-------
 .../impl/PartymemberBaseInfoServiceImpl.java  |  4 +--
 2 files changed, 21 insertions(+), 14 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 13dc1d53dd..a5158f964a 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
@@ -38,6 +38,7 @@ import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO
 import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -335,22 +336,28 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		//获取党员自动认证信息
 		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("手机号未匹配");
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
index 7f3d8f829b..f91dc23fe7 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java
@@ -287,7 +287,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 					gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName());
 			gridFullPath = gridFullPath.replaceAll("null", "").trim();
-			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+			gridFullPath = gridFullPath.replaceAll("--", "-").trim();
 		}
 		//查询居民认证信息，获取居民头像
 		List<String> userIdList = new ArrayList<>();
@@ -330,7 +330,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 					gridInfoResult.getData().getCommnuityName() == null?"":gridInfoResult.getData().getCommnuityName(),
 					gridInfoResult.getData().getGridName() == null?"":gridInfoResult.getData().getGridName());
 			gridFullPath = gridFullPath.replaceAll("null", "").trim();
-			gridFullPath = gridFullPath.replaceAll("--", "").trim();
+			gridFullPath = gridFullPath.replaceAll("--", "-").trim();
 		}
 		//查询居民认证信息，获取居民头像
 		List<String> userIdList = new ArrayList<>();