From 75fc825a6bb14e248a464b5fd474c3aa1532dcb6 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 09 May 2024 11:28:59 +0800
Subject: [PATCH] 新增机构树查询，可传入指定的机构id
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 11 +++++++++++
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 11 +++++++++++
src/main/java/org/springblade/modules/system/service/IDeptService.java | 7 +++++++
3 files changed, 29 insertions(+), 0 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 8e786a4..5944693 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -121,6 +121,17 @@
}
/**
+ * 获取部门树形结构
+ */
+ @GetMapping("/treeByDept")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> treeByDept(@RequestParam(value = "deptId", required = true) Long deptId) {
+ List<DeptVO> tree = deptService.tree(deptId);
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-tree")
diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index ed6347d..d252e00 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -51,6 +51,13 @@
List<DeptVO> tree(String tenantId);
/**
+ * 机构id
+ * @param deptId
+ * @return
+ */
+ List<DeptVO> tree(Long deptId);
+
+ /**
* 懒加载树形结构
*
* @param tenantId
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index a552d81..a0e13c5 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -116,6 +116,17 @@
return ForestNodeMerger.merge(tree);
}
+ /**
+ * 机构id
+ * @param deptId
+ * @return
+ */
+ @Override
+ public List<DeptVO> tree(Long deptId) {
+ List<DeptVO> tree = baseMapper.tree("000000", deptId);
+ return ForestNodeMerger.merge(tree);
+ }
+
@Override
public List<DeptVO> lazyTree(String tenantId, Long parentId) {
if (AuthUtil.isAdministrator()) {
--
Gitblit v1.9.3