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

---
 .../esua/epdc/commons/tools/exception/ErrorCode.java      | 1 +
 .../epdc/controller/ApiActUserRelationController.java     | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/exception/ErrorCode.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/exception/ErrorCode.java
index 097b9eff7..dc08b49ef 100644
--- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/exception/ErrorCode.java
+++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/exception/ErrorCode.java
@@ -40,4 +40,5 @@ public interface ErrorCode {
     int JSON_FORMAT_ERROR = 10016;
     int PARSING_ERROR = 10017;
     int INVALID_ERROR = 10018;
+    int VOLUNTEER_ERROR = 10021;
 }
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 15b4d6fa8..cb1548091 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
@@ -9,6 +9,7 @@ import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.enums.UserTagEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
+import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -76,11 +77,14 @@ public class ApiActUserRelationController {
         } else {
             actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value());
         }
-        
+
         String identityNo = epdcUserInfoResultDTO.getIdentityNo();
         String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo);
         if (StringUtils.isNotBlank(identityNoVerification)) {
-            return new Result().error(identityNoVerification);
+            Result result = new Result();
+            result.error(identityNoVerification);
+            result.setCode(ErrorCode.VOLUNTEER_ERROR);
+            return result;
         }
         actUserRelationDTO.setRealName(tokenDto.getRealName());
         String sex = IdentityNoUtils.getSex(identityNo); // 身份证解析性别