From bdef23946e420ba538870d6314034fbd42f00a66 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期三, 27 十一月 2024 18:38:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
start/src/main/java/com/ycl/web/controller/system/SysDeptController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java b/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
index f4d4b87..9eb0cea 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysDeptController.java
@@ -2,6 +2,8 @@
import java.util.List;
+import com.ycl.common.base.Result;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +37,10 @@
public class SysDeptController extends BaseController {
private final ISysDeptService deptService;
-
+ //涓氫富绔痠d
+ private final static Long userPortId = 101L;
+ //瀹℃壒绔痠d
+ private final static Long approvalPortId = 102L;
/**
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
@@ -131,4 +136,12 @@
deptService.checkDeptDataScope(deptId);
return toAjax(deptService.deleteDeptById(deptId));
}
+
+ @GetMapping("/approvalList")
+ @ApiOperation(value = "瀹℃壒閮ㄩ棬涓嬫媺鍒楄〃", notes = "瀹℃壒閮ㄩ棬涓嬫媺鍒楄〃")
+ public Result approvalList() {
+ SysDept dept = new SysDept();
+ dept.setParentId(approvalPortId);
+ return deptService.all(dept);
+ }
}
--
Gitblit v1.8.0