feat: 修改邮箱验证规则,邮箱不为空才进行邮箱验证

@@ -92,7 +92,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     boolean userExist;
     boolean userExist;
     if (StringUtils.isNotBlank(userDTO.getPassword())) {
     if (StringUtils.isNotBlank(userDTO.getPassword())) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
-    }else {
+    } else {
       user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
       user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
     }
     }
     userExist =
     userExist =
@@ -162,17 +162,21 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
       LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
       if (null == userDTO.getId()) {
       if (null == userDTO.getId()) {
         queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
         queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
-        queryWrapper.or().eq(User::getEmail, userDTO.getEmail());
-      }else{
+        queryWrapper
+            .or(StringUtils.isNotEmpty(userDTO.getEmail()))
+            .eq(User::getEmail, userDTO.getEmail());
+      } else {
         queryWrapper.ne(User::getId, userDTO.getId());
         queryWrapper.ne(User::getId, userDTO.getId());
         queryWrapper.and(
         queryWrapper.and(
             (userQueryWrapper -> {
             (userQueryWrapper -> {
               userQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
               userQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
-              userQueryWrapper.or().eq(User::getEmail, userDTO.getEmail());
+              userQueryWrapper
+                  .or(StringUtils.isNotEmpty(userDTO.getEmail()))
+                  .eq(User::getEmail, userDTO.getEmail());
             }));
             }));
       }
       }
       List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper);
       List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper);
-      if (null != existPhoneOrEmail && existPhoneOrEmail.size() >0) {
+      if (null != existPhoneOrEmail && existPhoneOrEmail.size() > 0) {
         throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());
         throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());
       }
       }
     }
     }
@@ -314,7 +318,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
       if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
         userPage = new Page<>();
         userPage = new Page<>();
       } else {
       } else {
-        queryMap.put("isTenantAdmin",true);
+        queryMap.put("isTenantAdmin", true);
         userPage = baseMapper.getUserPage(userIPage, queryMap);
         userPage = baseMapper.getUserPage(userIPage, queryMap);
       }
       }
     }
     }
@@ -576,7 +580,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     UserDTO userDTO = new UserDTO();
     UserDTO userDTO = new UserDTO();
     userDTO.setPhoneNumber(phoneNumber);
     userDTO.setPhoneNumber(phoneNumber);
     List<UserDTO> list = baseMapper.findUserInfoByPhoneNumber(userDTO);
     List<UserDTO> list = baseMapper.findUserInfoByPhoneNumber(userDTO);
-    return null !=list && list.size()>0 ? list.get(0):null;
+    return null != list && list.size() > 0 ? list.get(0) : null;
   }
   }
 
 
   @Override
   @Override