From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DeptController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 6b5559a..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
@@ -123,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);
+ }
+
/**
* 懒加载获取部门树形结构
*/
@@ -190,5 +198,11 @@
return R.data(deptService.getDeptAndUserTree(treeNode));
}
+ @GetMapping("updateAllDept")
+ public R updateAllDept(){
+ int number = deptService.updateAllDept();
+ return R.data(number);
+ }
+
}
--
Gitblit v1.9.3