From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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 9bcbad9..5944693 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -39,6 +39,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.node.DeptUserTreeNode;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.wrapper.DeptWrapper;
@@ -116,6 +117,17 @@
@ApiOperation(value = "树形结构", notes = "树形结构")
public R<List<DeptVO>> tree(String tenantId, BladeUser bladeUser) {
List<DeptVO> tree = deptService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+ return R.data(tree);
+ }
+
+ /**
+ * 获取部门树形结构
+ */
+ @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);
}
@@ -198,6 +210,14 @@
return R.data(deptService.dataHandle());
}
+ /**
+ * 数据处理(社区绑定）-- 处理社区
+ */
+ @GetMapping("/dataHandleCommunity")
+ public R dataHandleCommunity() {
+ return R.data(deptService.dataHandleCommunity());
+ }
+
/**
* 数据处理(区域网格编号绑定）
@@ -208,6 +228,34 @@
}
+ /**
+ * 查询组织机构树数据（下级包含人员信息）(数据量太大，不建议使用)
+ * @param treeNode
+ * @return
+ */
+ @GetMapping("/getDeptAndUserTree")
+ @ApiOperation(value = "查询组织机构树数据（下级包含人员信息）")
+ public R getDeptAndUserTree(DeptUserTreeNode treeNode) {
+ return R.data(deptService.getDeptAndUserTree(treeNode));
+ }
+ /**
+ * 数据处理(社区绑定）-- 处理社区(派出所下）
+ */
+ @GetMapping("/dataHandleCommunityByPolice")
+ public R dataHandleCommunityByPolice() {
+ return R.data(deptService.dataHandleCommunityByPolice());
+ }
+
+ /**
+ * 查询组织机构树数据（下级包含人员信息）(懒加载)
+ * @param treeNode
+ * @return
+ */
+ @GetMapping("/getDeptAndUserTreeLazyTree")
+ @ApiOperation(value = "查询组织机构树数据（下级包含人员信息）")
+ public R getDeptAndUserTreeLazyTree(DeptUserTreeNode treeNode) {
+ return R.data(deptService.getDeptAndUserTreeLazyTree(treeNode));
+ }
}
--
Gitblit v1.9.3