From 25198b9ea71515ca3ce9733a8bc6b507d18a3223 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 5 Jun 2020 15:32:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?=
 =?UTF-8?q?=E5=8A=A9=E3=80=91=E6=8A=A5=E5=90=8D=E5=BF=97=E6=84=BF=E8=80=85?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81bug=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2020-06-05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/ApiActUserRelationController.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
index 0ccfad84a..57b3c4759 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
@@ -79,6 +79,10 @@ public class ApiActUserRelationController {
 
 
         String identityNo = epdcUserInfoResultDTO.getIdentityNo();
+        if ("".equals(identityNo) || identityNo == null) {
+            // 身份证号码为空，需要重新认证志愿者
+            return isVolunteer;
+        }
         String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo);
         if (StringUtils.isNotBlank(identityNoVerification)) {
             return new Result().error(identityNoVerification);

From eaf7369150e4322e32b5a0f0e1b36ddaf1a825cb Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 5 Jun 2020 15:40:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?=
 =?UTF-8?q?=E5=8A=A9=E3=80=91=E6=8A=A5=E5=90=8D=E5=BF=97=E6=84=BF=E8=80=85?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81bug=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2020-06-05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/ApiActUserRelationController.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
index 57b3c4759..8fa5fdeb3 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
@@ -79,8 +79,11 @@ public class ApiActUserRelationController {
 
 
         String identityNo = epdcUserInfoResultDTO.getIdentityNo();
-        if ("".equals(identityNo) || identityNo == null) {
+        if (StringUtils.isEmpty(identityNo)) {
             // 身份证号码为空，需要重新认证志愿者
+            isVolunteer.setData(0);
+            isVolunteer.error("身份证号码无效，请重新认证志愿者！");
+
             return isVolunteer;
         }
         String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo);