From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 50a79de..b35637f 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
@@ -63,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;
@@ -123,13 +123,21 @@
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);
+ }
+
/**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-tree")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
- public R<List<DeptVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
+ public R<List<DeptVO>> lazyTree(String tenantId, String parentId, BladeUser bladeUser) {
List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), 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