From d1f46642c1641e4bd694062f2a349b6a57df5265 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sun, 18 Aug 2019 22:46:44 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/system/controller/DeptController.java | 2 +- .../java/org/springblade/system/controller/RoleController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index a8315cbf..0f1d33d0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -92,7 +92,7 @@ public class DeptController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "树形结构", notes = "树形结构") public R> tree(String tenantId, BladeUser bladeUser) { - List tree = deptService.tree(Func.toStr(tenantId, bladeUser.getTenantId())); + List tree = deptService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId())); return R.data(tree); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java index 313b42f1..fd118c08 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java @@ -91,7 +91,7 @@ public class RoleController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "树形结构", notes = "树形结构") public R> tree(String tenantId, BladeUser bladeUser) { - List tree = roleService.tree(Func.toStr(tenantId, bladeUser.getTenantId())); + List tree = roleService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId())); return R.data(tree); }