From 0216e745dc57d021c0fa81115811b74abd815f36 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 24 二月 2025 20:47:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
start/src/main/java/com/ycl/web/controller/system/SysDeptController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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..6ba80ff 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
@@ -1,7 +1,11 @@
package com.ycl.web.controller.system;
import java.util.List;
+import java.util.Objects;
+import com.ycl.common.base.Result;
+import com.ycl.common.core.domain.StringTreeSelect;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +39,10 @@
public class SysDeptController extends BaseController {
private final ISysDeptService deptService;
-
+ //涓氫富绔痠d
+ private final static Long userPortId = 101L;
+ //瀹℃壒绔痠d
+ private final static Long approvalPortId = 102L;
/**
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
@@ -44,6 +51,13 @@
public AjaxResult list(SysDept dept)
{
List<SysDept> depts = deptService.selectDeptList(dept);
+ return success(depts);
+ }
+
+ @GetMapping("/flowable/all")
+ public AjaxResult all()
+ {
+ List<StringTreeSelect> depts = deptService.flowableAll();
return success(depts);
}
@@ -100,7 +114,7 @@
{
return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
- else if (dept.getParentId().equals(deptId))
+ else if (Objects.nonNull(dept.getParentId()) && dept.getParentId().equals(deptId))
{
return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
}
@@ -131,4 +145,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