From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
index 0e3541a..61faadc 100644
--- a/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
+++ b/src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java
@@ -104,8 +104,8 @@
@GetMapping("/tree")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<JurisdictionVO>> tree(String tenantId, BladeUser bladeUser) {
- List<JurisdictionVO> tree = jurisdictionService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+ public R<List<JurisdictionVO>> tree(String tenantId) {
+ List<JurisdictionVO> tree = jurisdictionService.tree(tenantId);
return R.data(tree);
}
--
Gitblit v1.9.3