From 068e93cfe7e05cdd0161ae40e16e1c4eae4a2058 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Apr 2024 10:02:02 +0800
Subject: [PATCH] 机构关联水库，编辑水库行政区划时同步更改机构
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
index fd8aab6..8855f8a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java
@@ -16,6 +16,9 @@
*/
package cn.gistack.system.controller;
+import cn.gistack.common.node.DeptUserTreeNode;
+import cn.gistack.common.node.TreeNode;
+import cn.gistack.common.utils.NodeTreeUtil;
import cn.gistack.system.vo.DeptVO;
import cn.gistack.system.wrapper.DeptWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -60,7 +63,7 @@
@AllArgsConstructor
@RequestMapping("/dept")
@Api(value = "部门", tags = "部门")
-@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public class DeptController extends BladeController {
private final IDeptService deptService;
@@ -120,6 +123,14 @@
return R.data(tree);
}
+ @GetMapping("/treeByParentId")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> treeByParentId(String parentId) {
+ List<DeptVO> tree = deptService.treeByParentId(parentId);
+ return R.data(tree);
+ }
+
/**
* 懒加载获取部门树形结构
*/
@@ -176,4 +187,22 @@
}
+ /**
+ * 查询组织机构树数据（下级包含人员信息）
+ * @param treeNode
+ * @return
+ */
+ @GetMapping("/getDeptAndUserTree")
+ @ApiOperation(value = "查询组织机构树数据（下级包含人员信息）")
+ public R getDeptAndUserTree(DeptUserTreeNode treeNode) {
+ return R.data(deptService.getDeptAndUserTree(treeNode));
+ }
+
+ @GetMapping("updateAllDept")
+ public R updateAllDept(){
+ int number = deptService.updateAllDept();
+ return R.data(number);
+ }
+
+
}
--
Gitblit v1.9.3