Merge branch '20230822' into 'master_dev'

refactor: 租户管理员权限兼容老版本

See merge request yunteng/thingskit!225

@@ -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)

@@ -50,11 +50,12 @@ public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuE
     List<MenuDTO> menuDTOs;
     if (isSysAdminOrPtAdmin) {
       menuDTOs = baseMapper.selectSysAdminMenu();
-    } else if (isTenantAdmin) {
-      menuDTOs = baseMapper.selectTenantMenu(tenantId);
-    } else {
+    } else  {
       menuDTOs = baseMapper.selectMyMenu(userId);
     }
+    if (isTenantAdmin && menuDTOs ==null) {
+      menuDTOs = baseMapper.selectTenantMenu(tenantId);
+    }
     Map<String, MenuDTO> menuDTOMap = new LinkedHashMap<>(menuDTOs.size());
     menuDTOs.forEach(menuDTO -> menuDTOMap.put(menuDTO.getId(), menuDTO));
     return buildMenuDTOTree(menuDTOMap, needButton);

@@ -110,20 +110,22 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       allPermission = optionalPermission.orElseGet(menuMapper::getAllPermission);
-    } else if (isTenantAdmin) {
-      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + tenantId;
+    } else {
+      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + useerId;
       Optional<Set<String>> optionalPermission =
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       allPermission =
-          optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByTenantId(tenantId));
-    } else {
-      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + useerId;
+          optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByUserId(useerId));
+    }
+    /**租户管理员未获取到用户权限时，默认使用租户的权限*/
+    if (isTenantAdmin && allPermission.isEmpty()) {
+      cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + tenantId;
       Optional<Set<String>> optionalPermission =
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       allPermission =
-          optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByUserId(useerId));
+          optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByTenantId(tenantId));
     }
     if (cachePresent) {
       return allPermission;

@@ -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,9 +311,11 @@ 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());
+    }
+    if (null != userDTO.getOrganizationIds()) {
       userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
-          user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
+              user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;
@@ -449,8 +451,8 @@ 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());
+    for (String roleId : userDTO.getRoleIds()) {
+      roleMapper.saveUserRoleMapping(user.getId(), roleId);
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;
@@ -598,6 +600,9 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
               .stream()
               .map(SysUserRoleEntity::getRoleId)
               .collect(Collectors.toList());
+      if(roleIds.isEmpty()){
+        roleIds.add(UUID.randomUUID().toString());
+      }
       List<String> enableRoles =
           roleMapper
               .selectList(