党员认证-拒绝详情bug修改发布服务

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("手机号未匹配");