Showing
1 changed file
with
6 additions
and
7 deletions
| @@ -150,21 +150,20 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> | @@ -150,21 +150,20 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> | ||
| 150 | && StringUtils.isAllBlank(userDTO.getPhoneNumber())) { | 150 | && StringUtils.isAllBlank(userDTO.getPhoneNumber())) { |
| 151 | throw new YtDataValidationException(ErrorMessage.PHONE_NUMBER_OR_EMAIL_REQUIRED.getMessage()); | 151 | throw new YtDataValidationException(ErrorMessage.PHONE_NUMBER_OR_EMAIL_REQUIRED.getMessage()); |
| 152 | } | 152 | } |
| 153 | - boolean needCheck = false; | 153 | + boolean needCheck = true; |
| 154 | if (null != userDTO.getId()) { | 154 | if (null != userDTO.getId()) { |
| 155 | User user = baseMapper.selectById(userDTO.getId()); | 155 | User user = baseMapper.selectById(userDTO.getId()); |
| 156 | - if (!user.getPhoneNumber().equals(userDTO.getPhoneNumber()) | ||
| 157 | - || !user.getEmail().equals(userDTO.getEmail())) { | ||
| 158 | - needCheck = true; | 156 | + if (user.getPhoneNumber().equals(userDTO.getPhoneNumber()) |
| 157 | + && user.getEmail().equals(userDTO.getEmail())) { | ||
| 158 | + needCheck = false; | ||
| 159 | } | 159 | } |
| 160 | } | 160 | } |
| 161 | - if (needCheck || null == userDTO.getId()) { | 161 | + if (needCheck) { |
| 162 | LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>(); | 162 | LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>(); |
| 163 | if (null == userDTO.getId()) { | 163 | if (null == userDTO.getId()) { |
| 164 | queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber()); | 164 | queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber()); |
| 165 | queryWrapper.or().eq(User::getEmail, userDTO.getEmail()); | 165 | queryWrapper.or().eq(User::getEmail, userDTO.getEmail()); |
| 166 | - } | ||
| 167 | - if (needCheck) { | 166 | + }else{ |
| 168 | queryWrapper.ne(User::getId, userDTO.getId()); | 167 | queryWrapper.ne(User::getId, userDTO.getId()); |
| 169 | queryWrapper.and( | 168 | queryWrapper.and( |
| 170 | (userQueryWrapper -> { | 169 | (userQueryWrapper -> { |