Merge remote-tracking branch 'origin/master'

lin

2024-03-23 b3a0e5051c2923b5e12b059b6634aa9bd12db59b

 src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java

@@ -80,7 +80,7 @@
      }
      List<RoleVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
      List<RoleVO> copy = BeanUtil.copy(merge, RoleVO.class);
      if (!AuthUtil.isAdministrator()) {
      if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         List<RoleVO> collect = copy.stream().filter(item -> roleId.contains(item.getId().toString())).collect(Collectors.toList());
         return collect;
      }