Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

 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;
      }