From bc1f282f1cc9bdad3225ec8d1acea44d7835aba6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 15 Nov 2021 14:00:49 +0800
Subject: [PATCH] 1.分公司权限

---
 src/main/java/org/springblade/modules/system/controller/DeptController.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 5350a6d..bafd574 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -125,8 +125,19 @@
 	@GetMapping("/lazy-tree")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
-	public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
-		List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+	public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser,String userId) {
+		List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId,userId);
+		return R.data(tree);
+	}
+
+	/**
+	 * 懒加载获取部门树形结构,根据辖区查询
+	 */
+	@GetMapping("/lazy-tree-jurisdiction")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+	public R<List<DeptVO>> lazyTreeJurisdiction(String jurisdiction, Long parentId) {
+		List<DeptVO> tree = deptService.lazyTreeJurisdiction(jurisdiction,parentId);
 		return R.data(tree);
 	}
 
@@ -236,4 +247,12 @@
 		return R.data(tree);
 	}
 
+
+	@GetMapping("/selectInfos")
+	public R<List<DeptVO>> selectInfos() {
+		List<DeptVO> tree =deptService.selectInfos();
+		return R.data(tree);
+	}
+
+
 }

--
Gitblit v1.9.3