From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 4012529..56940f4 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -6,7 +6,9 @@
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.service.ISysDeptService;
@@ -37,7 +39,11 @@
*/
@GetMapping("/getDept")
public AjaxResult getDept() {
- List<SysDept> sysDeptList =sysDeptService.selectDeptList(new SysDept());
+ Long userId = SecurityUtils.getUserId();
+ LoginUser user = SecurityUtils.getLoginUser();
+ Long[] deptIds = SecurityUtils.getDeptId();
+
+ List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
return AjaxResult.success(sysDeptList);
}
@@ -105,7 +111,7 @@
@DeleteMapping("/deleteIds")
@ApiOperation(value = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ public AjaxResult deleteIds(@RequestBody List<String> ids) {
if (ids == null || ids.size() == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
--
Gitblit v1.9.3