From 4c503822ca62b64f986adfe23eb8caf3da62dd47 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 13 Jan 2020 17:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=8F=82=E6=95=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 8 ++++---- .../dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index a9353aafa..4fcc65c04 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1107,21 +1107,21 @@ public class AppUserServiceImpl implements AppUserService { formDto.setSex(sex); // 性别 formDto.setBirthday(birthday); // 生日 formDto.setUserId(tokenDto.getUserId()); // 用户ID - //验证是否为志愿者 + // 验证是否为志愿者 Result volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId()); if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) { return new Result().error("志愿者认证失败"); } else if (volunteerCountResult.getData() == 0) { - //添加志愿者 + // 添加志愿者 Result insertCountResult = userFeignClient.insertVolunteerInfo(formDto); } - //调用用户完善个人信息-保存 + // 调用用户完善个人信息-保存 EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class); if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志 } else { - epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value());// 党员标志 + epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志 } Result result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java index 8097369a3..aa350cfbc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java @@ -34,8 +34,8 @@ public class EpdcCompleteVolunteerInfoFormDTO implements Serializable { @NotBlank(message = "手机号不能为空") private String mobile; - @NotBlank(message = "党员标识不能为空") - private String partyFlag; + //@NotBlank(message = "党员标识不能为空") + //private String partyFlag; /** * 身份证号码