From 0b1e9e70818f0e3eb32dd6c029d42d93236ecdc6 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 03 Jul 2024 12:07:01 +0800
Subject: [PATCH] 数据同步新增连接池配置
---
src/main/java/org/springblade/modules/system/service/impl/RoleServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 aa07959..bdacb04 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
@@ -26,6 +26,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.CollectionUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.entity.Role;
@@ -72,12 +73,20 @@
@Override
public List<RoleVO> tree(String tenantId) {
String userRole = AuthUtil.getUserRole();
+ String roleId = AuthUtil.getUser().getRoleId();
String excludeRole = null;
if (!CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMIN) && !CollectionUtil.contains(Func.toStrArray(userRole), RoleConstant.ADMINISTRATOR)) {
excludeRole = RoleConstant.ADMIN;
}
- return ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
+ List<RoleVO> merge = ForestNodeMerger.merge(baseMapper.tree(tenantId, excludeRole));
+ List<RoleVO> copy = BeanUtil.copy(merge, RoleVO.class);
+ if (!AuthUtil.isAdministrator()) {
+ List<RoleVO> collect = copy.stream().filter(item -> roleId.contains(item.getId().toString())).collect(Collectors.toList());
+ return collect;
+ }
+ return merge;
}
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -109,7 +118,7 @@
// 新增配置
roleMenuService.saveBatch(roleMenus);
// 递归设置下属角色菜单集合
- recursionRoleMenu(roleIds, menuIds);
+// recursionRoleMenu(roleIds, menuIds);
return true;
}
@@ -197,6 +206,8 @@
throw new ServiceException("父节点不可选择自身!");
}
role.setTenantId(parent.getTenantId());
+ } else {
+ role.setParentId(Long.parseLong(AuthUtil.getUser().getRoleId()));
}
// role.setParentId(Long.parseLong(AuthUtil.getUser().getRoleId()));
role.setIsDeleted(BladeConstant.DB_NOT_DELETED);
@@ -236,6 +247,7 @@
/**
* 自定义列表（只获取当前角色下级角色）
+ *
* @param roleParam
* @return
*/
--
Gitblit v1.9.3