fix: 租户角色不存在时，第二次提交表单提示用户名已经存在的问题

1、回滚提交记录【租户角色不存在，会留存脏数据】
2、添加租户管理员时验证租户角色是否存在

@@ -185,9 +185,9 @@ public class YtUserController extends AbstractUserAccount {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
+    userService.validateTenantRole(userDTO.getTenantId());
+    //租户角色不存在，会留存脏数据
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(userDTO.getTenantId()));
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(userDTO.getTenantId()));
-    UserDTO returnUser = userService.saveTenantAdmin(
-            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
     try {
     try {
       // 创建TB的租户管理员
       // 创建TB的租户管理员
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
@@ -202,7 +202,8 @@ public class YtUserController extends AbstractUserAccount {
       throw handleException(e);
       throw handleException(e);
     }
     }
 
 
-    return returnUser;
+    return userService.saveTenantAdmin(
+            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping

@@ -427,15 +427,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException("用户已存在");
       throw new YtDataValidationException("用户已存在");
     }
     }
     baseMapper.insert(user);
     baseMapper.insert(user);
-    List<TenantRole> tenantRoleList =
-        tenantRoleMapper.selectList(
-            new QueryWrapper<TenantRole>()
-                .lambda()
-                .eq(TenantRole::getTenantId, userDTO.getTenantId()));
-    // 保存用户与角色的映射信息
-    if (null == tenantRoleList || tenantRoleList.size() == 0) {
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
+    List<TenantRole> tenantRoleList =validateTenantRole(userDTO.getTenantId()) ;
     for (TenantRole tenantRole : tenantRoleList) {
     for (TenantRole tenantRole : tenantRoleList) {
       roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
       roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
     }
     }
@@ -444,6 +436,20 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
   }
 
 
   @Override
   @Override
+  public List<TenantRole> validateTenantRole(String tenantId) {
+    List<TenantRole> tenantRoleList =
+            tenantRoleMapper.selectList(
+                    new QueryWrapper<TenantRole>()
+                            .lambda()
+                            .eq(TenantRole::getTenantId, tenantId));
+    // 保存用户与角色的映射信息
+    if (null == tenantRoleList || tenantRoleList.size() == 0) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return tenantRoleList;
+  }
+
+  @Override
   @Transactional
   @Transactional
   public void resetPassword(String userId, String tenantId, String password) {
   public void resetPassword(String userId, String tenantId, String password) {
     UserDTO userDTO = findUserInfoById(userId);
     UserDTO userDTO = findUserInfoById(userId);

@@ -8,6 +8,7 @@ import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.RoleOrOrganizationReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.RoleOrOrganizationReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
 import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.TenantRole;
 import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.User;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -48,6 +49,12 @@ public interface YtUserService {
 
 
   void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO);
   void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO);
 
 
+  /**
+   * 验证租户角色是否有效
+   * @param tenantId
+   */
+  List<TenantRole> validateTenantRole(String tenantId);
+
   UserDTO findUserInfoById(String id);
   UserDTO findUserInfoById(String id);
   /**
   /**
    * 发送密码重置新消息
    * 发送密码重置新消息