From b888bc1c70223d8fc43d22b360114fdd4ef375b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Sun, 24 May 2020 23:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E3=80=91-=E3=80=90=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E3=80=91-lipf-20200524?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/UserServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 06d23503c..bf27ef842 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -223,7 +223,9 @@ public class UserServiceImpl extends BaseServiceImpl implem @Transactional(rollbackFor = Exception.class) public void audit(UserDTO dto) { - this.verifyUserInfo(dto); + if (StringUtils.isBlank(dto.getPartyFlag()) && StringUtils.isBlank(dto.getPartyFlag().trim())) { + throw new RenException("身份标识不能为空"); + } String userId = dto.getId(); UserEntity findUser = this.baseDao.selectById(userId); // 手动认证为党员 @@ -941,7 +943,8 @@ public class UserServiceImpl extends BaseServiceImpl implem updateUserPartyMemberInfo(userDTO); } else { userDTO.setPartyFlag(YesOrNoEnum.NO.value()); - updateUserPartyMemberInfo(userDTO); + UserEntity entity = ConvertUtils.sourceToTarget(userDTO, UserEntity.class); + updateById(entity); result = new Result().error(UserModuleErrorCode.AUTHENTICATION_CODE); } } @@ -1589,6 +1592,9 @@ public class UserServiceImpl extends BaseServiceImpl implem if (StringUtils.isBlank(dto.getRealName()) && StringUtils.isBlank(dto.getRealName().trim())) { throw new RenException("用户姓名不能为空"); } + if (StringUtils.isBlank(dto.getId()) && StringUtils.isBlank(dto.getId().trim())) { + throw new RenException("id不能为空"); + } if (StringUtils.isBlank(dto.getMobile()) && StringUtils.isBlank(dto.getMobile().trim())) { throw new RenException("手机号不能为空"); }