feat: 添加用户时，进行手机号码、邮箱、用户名的验证

@@ -145,6 +145,9 @@ public class YtUserController extends BaseController {
       @RequestParam(value = "sendMsg", required = false, defaultValue = "false") boolean sendMsg,
       @RequestParam(value = "sendMsg", required = false, defaultValue = "false") boolean sendMsg,
       @Validated({AddGroup.class}) @RequestBody UserDTO userDTO)
       @Validated({AddGroup.class}) @RequestBody UserDTO userDTO)
       throws ThingsboardException {
       throws ThingsboardException {
+
+    //检查用户手机号、邮箱
+    userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     // 如果当前用户是租户管理员，则代表创建的用户为CUSTOMER_USER,则需要调用TB,否则为本平台的管理员不需要调用TB
     // 如果当前用户是租户管理员，则代表创建的用户为CUSTOMER_USER,则需要调用TB,否则为本平台的管理员不需要调用TB
     boolean isTenantAdminOperator = getCurrentUser().isPtTenantAdmin();
     boolean isTenantAdminOperator = getCurrentUser().isPtTenantAdmin();
     if (isTenantAdminOperator) {
     if (isTenantAdminOperator) {
@@ -234,7 +237,7 @@ public class YtUserController extends BaseController {
   public ResponseResult<UserDTO> accountExist(@PathVariable String username)
   public ResponseResult<UserDTO> accountExist(@PathVariable String username)
       throws ThingsboardException {
       throws ThingsboardException {
     return ResponseResult.success(
     return ResponseResult.success(
-        userService.accountExist(username,getCurrentUser().getCurrentTenantId()));
+        userService.accountExist(username));
   }
   }
 
 
   @ApiOperation(value = "判断电话是否重复")
   @ApiOperation(value = "判断电话是否重复")

@@ -552,12 +552,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
   }
 
 
   @Override
   @Override
-  public UserDTO accountExist(String userName, String tenantId) {
+  public UserDTO accountExist(String userName) {
     if (StringUtils.isEmpty(userName)) {
     if (StringUtils.isEmpty(userName)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
     UserDTO userDTO = new UserDTO();
     UserDTO userDTO = new UserDTO();
-    userDTO.setTenantId(tenantId);
     userDTO.setUsername(userName);
     userDTO.setUsername(userName);
     return baseMapper.findUserInfo(userDTO);
     return baseMapper.findUserInfo(userDTO);
   }
   }
@@ -575,7 +574,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     }
     UserDTO userDTO = new UserDTO();
     UserDTO userDTO = new UserDTO();
     userDTO.setPhoneNumber(phoneNumber);
     userDTO.setPhoneNumber(phoneNumber);
-    return baseMapper.findUserInfoByPhoneNumber(userDTO);
+    List<UserDTO> list = baseMapper.findUserInfoByPhoneNumber(userDTO);
+    return null !=list && list.size()>0 ? list.get(0):null;
   }
   }
 
 
   @Override
   @Override

@@ -32,7 +32,7 @@ public interface UserMapper extends BaseMapper<User> {
 
 
     UserDTO findUserInfo(UserDTO userDTO);
     UserDTO findUserInfo(UserDTO userDTO);
 
 
-    UserDTO findUserInfoByPhoneNumber(UserDTO userDTO);
+    List<UserDTO> findUserInfoByPhoneNumber(UserDTO userDTO);
 
 
     String findUserCustomerIdById(@Param("userId") String userId);
     String findUserCustomerIdById(@Param("userId") String userId);
 
 

@@ -60,7 +60,7 @@ public interface YtUserService {
    * @param username 账号
    * @param username 账号
    * @return 账号信息
    * @return 账号信息
    */
    */
-  UserDTO accountExist(String username, String tenantId);
+  UserDTO accountExist(String username);
 
 
   /**
   /**
    * 判断电话是否注册过
    * 判断电话是否注册过

@@ -157,7 +157,6 @@
         <include refid="columns"/>
         <include refid="columns"/>
         FROM sys_user su
         FROM sys_user su
         WHERE su.username=#{username}
         WHERE su.username=#{username}
-        AND su.tenant_id=#{tenantId}
     </select>
     </select>
     <select id="findUserInfoByPhoneNumber" resultMap="userDTOMap">
     <select id="findUserInfoByPhoneNumber" resultMap="userDTOMap">
         SELECT
         SELECT