From f22255579ddc213725b6bb5d27958628117f7262 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 06 May 2023 19:07:23 +0800
Subject: [PATCH] 用户管理新增角色权限控制（超级管理员不控制）
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/RoleController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 938b1ed..703cedb 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
@@ -59,7 +59,7 @@
@AllArgsConstructor
@RequestMapping("/role")
@Api(value = "角色", tags = "角色")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class RoleController extends BladeController {
private final IRoleService roleService;
@@ -99,6 +99,14 @@
@ApiOperation(value = "树形结构", notes = "树形结构")
public R<List<RoleVO>> tree(String tenantId, BladeUser bladeUser) {
List<RoleVO> tree = roleService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+ return R.data(tree);
+ }
+
+ @GetMapping("/treeByParentId")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<RoleVO>> treeByParentId(String parentId) {
+ List<RoleVO> tree = roleService.treeByParentId(parentId);
return R.data(tree);
}
@@ -168,4 +176,14 @@
return R.data(list);
}
+ /**
+ * 获取所有角色
+ */
+ @GetMapping("/all")
+ @ApiOperation(value = "获取所有角色")
+ public R<List<Role>> getAll() {
+ List<Role> list = roleService.list();
+ return R.data(list);
+ }
+
}
--
Gitblit v1.9.3