From fa539d8ec0b5f4d974eafff3e4bffe9395932ff4 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Fri, 12 Jul 2024 15:49:02 +0800
Subject: [PATCH] 支持多部门
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
index 703cedb..4abd035 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java
@@ -30,6 +30,7 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
@@ -87,6 +88,10 @@
@ApiOperation(value = "列表", notes = "传入role")
public R<List<RoleVO>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
+ // 不是超级管理员，排除超级管理员查询
+ if (!AuthUtil.isAdministrator()){
+ queryWrapper.ne("ROLE_ALIAS", "administrator");
+ }
List<Role> list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(RoleWrapper.build().listNodeVO(list));
}
@@ -111,6 +116,18 @@
}
/**
+ * 根据父级角色查询子角色
+ * @param parentId
+ * @return
+ */
+ @GetMapping("/treeByParentIdNew")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<RoleVO>> treeByParentIdNew(String parentId) {
+ List<RoleVO> tree = roleService.treeByParentIdNew(parentId);
+ return R.data(tree);
+ }
+ /**
* 获取指定角色树形结构
*/
@GetMapping("/tree-by-id")
--
Gitblit v1.9.3