Showing
1 changed file
with
10 additions
and
13 deletions
| @@ -174,21 +174,18 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> | @@ -174,21 +174,18 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> | ||
| 174 | } | 174 | } |
| 175 | if (needCheck) { | 175 | if (needCheck) { |
| 176 | LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>(); | 176 | LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>(); |
| 177 | - if (null == userDTO.getId()) { | ||
| 178 | - queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber()); | ||
| 179 | - queryWrapper | ||
| 180 | - .or(StringUtils.isNotEmpty(userDTO.getEmail())) | ||
| 181 | - .eq(User::getEmail, userDTO.getEmail()); | ||
| 182 | - } else { | 177 | + if (null != userDTO.getId()) { |
| 183 | queryWrapper.ne(User::getId, userDTO.getId()); | 178 | queryWrapper.ne(User::getId, userDTO.getId()); |
| 184 | - queryWrapper.and( | ||
| 185 | - (userQueryWrapper -> { | ||
| 186 | - userQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber()); | ||
| 187 | - userQueryWrapper | ||
| 188 | - .or(StringUtils.isNotEmpty(userDTO.getEmail())) | ||
| 189 | - .eq(User::getEmail, userDTO.getEmail()); | ||
| 190 | - })); | ||
| 191 | } | 179 | } |
| 180 | + queryWrapper.and( | ||
| 181 | + userLambdaQueryWrapper -> { | ||
| 182 | + userLambdaQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber()); | ||
| 183 | + userLambdaQueryWrapper.or( | ||
| 184 | + StringUtils.isNotEmpty(userDTO.getEmail()), | ||
| 185 | + (userQueryWrapper -> { | ||
| 186 | + userQueryWrapper.eq(User::getEmail, userDTO.getEmail()); | ||
| 187 | + })); | ||
| 188 | + }); | ||
| 192 | List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper); | 189 | List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper); |
| 193 | if (null != existPhoneOrEmail && existPhoneOrEmail.size() > 0) { | 190 | if (null != existPhoneOrEmail && existPhoneOrEmail.size() > 0) { |
| 194 | throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage()); | 191 | throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage()); |