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("手机号不能为空"); }