From ae0bbf65648dec5be4cbf62b381f0151b019369f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 22:40:32 +0800
Subject: [PATCH] 1.派遣记录接口修改 2.保安列表接口修改
---
src/main/java/org/springblade/modules/system/controller/RoleController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..95c20a3 100644
--- a/src/main/java/org/springblade/modules/system/controller/RoleController.java
+++ b/src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -94,8 +94,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 +105,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