From c0fa64f0fa74ac4fef06e1b472031a32c3be42fa Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 23 Mar 2024 18:12:28 +0800
Subject: [PATCH] 文章浏览记录,积分基层接口新增,矛盾纠纷事件接口新增

---
 src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
index bdacb04..ebcbae0 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java
+++ b/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;
 		}

--
Gitblit v1.9.3