fix: 修改手机邮箱Lambda验证规则

@@ -174,21 +174,18 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     if (needCheck) {
       LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
-      if (null == userDTO.getId()) {
-        queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
-        queryWrapper
-            .or(StringUtils.isNotEmpty(userDTO.getEmail()))
-            .eq(User::getEmail, userDTO.getEmail());
-      } else {
+      if (null != userDTO.getId()) {
         queryWrapper.ne(User::getId, userDTO.getId());
-        queryWrapper.and(
-            (userQueryWrapper -> {
-              userQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
-              userQueryWrapper
-                  .or(StringUtils.isNotEmpty(userDTO.getEmail()))
-                  .eq(User::getEmail, userDTO.getEmail());
-            }));
       }
+      queryWrapper.and(
+          userLambdaQueryWrapper -> {
+            userLambdaQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
+            userLambdaQueryWrapper.or(
+                StringUtils.isNotEmpty(userDTO.getEmail()),
+                (userQueryWrapper -> {
+                  userQueryWrapper.eq(User::getEmail, userDTO.getEmail());
+                }));
+          });
       List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper);
       if (null != existPhoneOrEmail && existPhoneOrEmail.size() > 0) {
         throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());