From 85e4522283d969e7e25619772c7f8a1f89ad8ccd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sun, 07 May 2023 15:33:18 +0800
Subject: [PATCH] 解决超级管理员用户角色出不来的问题
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
index 8e2dbf8..b06d143 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/RoleServiceImpl.java
@@ -37,6 +37,7 @@
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.CollectionUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringPool;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -79,6 +80,14 @@
}
@Override
+ public List<RoleVO> treeByParentId(String parentId) {
+ if (AuthUtil.isAdministrator()) {
+ return ForestNodeMerger.merge(baseMapper.tree(null, RoleConstant.ADMINISTRATOR));
+ }
+ return ForestNodeMerger.merge(baseMapper.treeByParentId(parentId));
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean grant(@NotEmpty List<Long> roleIds, List<Long> menuIds, List<Long> dataScopeIds, List<Long> apiScopeIds) {
return grantRoleMenu(roleIds, menuIds) && grantDataScope(roleIds, dataScopeIds) && grantApiScope(roleIds, apiScopeIds);
--
Gitblit v1.9.3