refactor: 租户管理员权限有租户级调整为用户级

@@ -10,6 +10,7 @@ import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum;
 
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Set;
 
 @EqualsAndHashCode(callSuper = false)
@@ -38,7 +39,7 @@ public class UserDTO extends BaseDTO {
   private String[] organizationIds;
 
   @ApiModelProperty(value = "角色ids")
-  private String[] roleIds;
+  private List<String> roleIds;
 
   @ApiModelProperty(value = "电话号码")
   @NotEmpty(message = "电话号码不能为空或字符串", groups = AddGroup.class)

@@ -130,7 +130,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
         SysUserRoleEntity userRole = new SysUserRoleEntity();
         userRole.setUserId(user.getId());
         userRole.setRoleId(roleId);
-        userRoleMapper.insert(userRole);
+//        userRoleMapper.insert(userRole);
       }
       // 绑定用户和组织的关系
       organizationService.bindUserToOrganization(
@@ -311,7 +311,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     }
     baseMapper.updateById(user);
     if (null != userDTO.getRoleIds()) {
-      deleteAndAddUserRole(user.getId(), Arrays.asList(userDTO.getRoleIds()));
+      deleteAndAddUserRole(user.getId(), userDTO.getRoleIds());
       userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
           user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
     }
@@ -450,7 +450,10 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     baseMapper.insert(user);
     List<SysTenantRoleEntity> tenantRoleList = validateTenantRole(userDTO.getTenantId());
     for (SysTenantRoleEntity tenantRole : tenantRoleList) {
-      roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
+      String roleId = tenantRole.getRoleId();
+      if(userDTO.getRoleIds().contains(roleId)){
+        roleMapper.saveUserRoleMapping(user.getId(), roleId);
+      }
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;