From 0b7d3956104426517fbadaee526efa36d20112e7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 27 二月 2025 16:30:21 +0800
Subject: [PATCH] 流程推进统计table内容调整
---
start/src/main/java/com/ycl/web/controller/system/SysDeptController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 9eb0cea..bc4529d 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,8 +1,10 @@
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;
@@ -41,14 +43,22 @@
private final static Long userPortId = 101L;
//瀹℃壒绔痠d
private final static Long approvalPortId = 102L;
+
/**
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
+// @PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list")
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);
}
@@ -105,7 +115,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() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
}
@@ -142,6 +152,6 @@
public Result approvalList() {
SysDept dept = new SysDept();
dept.setParentId(approvalPortId);
- return deptService.all(dept);
+ return Result.ok().data(deptService.selectDeptListNoAuth(dept));
}
}
--
Gitblit v1.8.0