From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/DeptController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 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 99c2ba4..8e786a4 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;
@@ -190,5 +191,60 @@
return R.data(list);
}
+ /**
+ * 数据处理(社区绑定）
+ */
+ @GetMapping("/dataHandle")
+ public R dataHandle() {
+ return R.data(deptService.dataHandle());
+ }
+
+ /**
+ * 数据处理(社区绑定）-- 处理社区
+ */
+ @GetMapping("/dataHandleCommunity")
+ public R dataHandleCommunity() {
+ return R.data(deptService.dataHandleCommunity());
+ }
+
+
+ /**
+ * 数据处理(区域网格编号绑定）
+ */
+ @GetMapping("/dataRegionGridCodeBindHandle")
+ public R dataRegionGridCodeBindHandle() {
+ return R.data(deptService.dataRegionGridCodeBindHandle());
+ }
+
+
+ /**
+ * 查询组织机构树数据（下级包含人员信息）(数据量太大，不建议使用)
+ * @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