From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改
---
src/main/java/org/springblade/modules/system/controller/RoleController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/RoleController.java b/src/main/java/org/springblade/modules/system/controller/RoleController.java
index 95b2311..62d2c5d 100644
--- a/src/main/java/org/springblade/modules/system/controller/RoleController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -56,7 +56,7 @@
@AllArgsConstructor
@RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/role")
@Api(value = "角色", tags = "角色")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class RoleController extends BladeController {
private final IRoleService roleService;
@@ -70,6 +70,18 @@
public R<RoleVO> detail(Role role) {
Role detail = roleService.getOne(Condition.getQueryWrapper(role));
return R.data(RoleWrapper.build().entityVO(detail));
+ }
+
+
+ /**
+ * 详情
+ */
+ @GetMapping("/details")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "详情", notes = "传入role")
+ public R<Role> details(Role role) {
+ Role detail = roleService.getOne(Condition.getQueryWrapper(role));
+ return R.data(detail);
}
/**
@@ -94,8 +106,8 @@
@GetMapping("/tree")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<RoleVO>> tree(String tenantId, BladeUser bladeUser) {
- List<RoleVO> tree = roleService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+ public R<List<RoleVO>> tree(String tenantId,Long deptId,BladeUser bladeUser) {
+ List<RoleVO> tree = roleService.tree(Func.toStrWithEmpty(tenantId,bladeUser.getTenantId()),deptId);
return R.data(tree);
}
@@ -105,9 +117,9 @@
@GetMapping("/tree-by-id")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<RoleVO>> treeById(Long roleId, BladeUser bladeUser) {
+ public R<List<RoleVO>> treeById(Long roleId,Long deptId, BladeUser bladeUser) {
Role role = SysCache.getRole(roleId);
- List<RoleVO> tree = roleService.tree(Func.notNull(role) ? role.getTenantId() : bladeUser.getTenantId());
+ List<RoleVO> tree = roleService.tree(Func.notNull(role) ? role.getTenantId() : bladeUser.getTenantId(),deptId);
return R.data(tree);
}
--
Gitblit v1.9.3