From 68d679b372891f555c7d100c44b6dd12b4f4710e Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 5 Jun 2020 17:30:17 +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, 3 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 97c4f40ef..8bd430a3d 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 @@ -60,7 +60,7 @@ public class ApiActUserRelationController { Result isVolunteer = appUserService.getVolunteerCountById(tokenDto); int code = isVolunteer.getCode(); if (code != 0) { - //不是志愿者 + // 不是志愿者 return isVolunteer; } Result userInfo = appUserService.getInfoById(tokenDto); @@ -82,6 +82,8 @@ public class ApiActUserRelationController { if (StringUtils.isEmpty(identityNo)) { // 身份证号码为空，需要重新认证志愿者 isVolunteer.setData(0); + isVolunteer.setCode(1); + isVolunteer.error("身份证号码无效，请重新认证志愿者！"); return isVolunteer; } String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo); From 4d7138d43cf5c14f600b683222dc1988c0d91699 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 5 Jun 2020 17:35:55 +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 --- .../epdc/controller/ApiActUserRelationController.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 8bd430a3d..15b4d6fa8 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 @@ -76,16 +76,8 @@ public class ApiActUserRelationController { } else { actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value()); } - - + String identityNo = epdcUserInfoResultDTO.getIdentityNo(); - if (StringUtils.isEmpty(identityNo)) { - // 身份证号码为空，需要重新认证志愿者 - isVolunteer.setData(0); - isVolunteer.setCode(1); - isVolunteer.error("身份证号码无效，请重新认证志愿者！"); - return isVolunteer; - } String identityNoVerification = IdentityNoUtils.IdentityNoVerification(identityNo); if (StringUtils.isNotBlank(identityNoVerification)) { return new Result().error(identityNoVerification);