|
@@ -262,14 +262,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
userUpdateAddBo.setModifierName(loginUser.getUsername());
|
|
|
UserVo oldUser = queryById(bo.getUserId());
|
|
|
if (!StringUtils.isBlank(update.getRealname())){
|
|
|
- if(!oldUser.getRealname().equals(update.getRealname())){
|
|
|
+ if(Validator.isEmpty(oldUser.getRealname()) || !oldUser.getRealname().equals(update.getRealname())){
|
|
|
userUpdateAddBo.setUserId(bo.getUserId());
|
|
|
userUpdateAddBo.setRealname(update.getRealname());
|
|
|
}
|
|
|
}
|
|
|
if (!StringUtils.isBlank(update.getTelphone())){
|
|
|
//手机号变更
|
|
|
- if(!oldUser.getTelphone().equals(update.getTelphone())){
|
|
|
+ if(Validator.isEmpty(oldUser.getTelphone()) || !oldUser.getTelphone().equals(update.getTelphone())){
|
|
|
User user = getOne(new LambdaQueryWrapper<User>()
|
|
|
.eq(User::getTelphone,update.getTelphone()).ne(User::getUserId,update.getUserId()).last("limit 1"));
|
|
|
if(Validator.isNotNull(user)){
|
|
@@ -281,8 +281,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
|
|
|
}
|
|
|
if (!StringUtils.isBlank(update.getIdCard())){
|
|
|
- //手机号变更
|
|
|
- if(!oldUser.getIdCard().equals(update.getIdCard())){
|
|
|
+ //身份证变更
|
|
|
+ if(Validator.isEmpty(oldUser.getIdCard()) || !oldUser.getIdCard().equals(update.getIdCard())){
|
|
|
Long list = iClassGradeUserService.selectList(update);
|
|
|
if (list > 0){
|
|
|
throw new IllegalAccessException("身份证已经被使用注册为学员");
|