From 9cbad80abaabd430de6a9739fb2c898d3b10193a Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期四, 10 七月 2025 16:58:24 +0800
Subject: [PATCH] 协调审批对接修改后
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 25fd122..5ae9a7c 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -1,5 +1,6 @@
package com.ruoyi.approve.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.service.IApproveProcessService;
import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
import com.ruoyi.approve.vo.ApproveProcessVO;
@@ -7,6 +8,10 @@
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.domain.SysUserDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.project.system.service.ISysUserDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +30,8 @@
@Autowired
private IApproveProcessService approveProcessService;
+ @Autowired
+ private ISysUserDeptService sysUserDeptService;
/**銆�
* 鑾峰彇閮ㄩ棬鍒楄〃
* @return
@@ -32,9 +39,8 @@
@GetMapping("/getDept")
public AjaxResult getDept() {
Long userId = SecurityUtils.getUserId();
- LoginUser user = SecurityUtils.getLoginUser();
- Long[] deptIds = SecurityUtils.getDeptId();
-
+ List<SysUserDept> userDeptList = sysUserDeptService.getUserDeptList(userId);
+ Long[] deptIds = userDeptList.stream().map(SysUserDept::getDeptId).toArray(Long[]::new);
List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
return AjaxResult.success(sysDeptList);
}
@@ -60,7 +66,7 @@
* @return
*/
@GetMapping("/get")
- public AjaxResult get(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
}
@@ -81,12 +87,12 @@
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
/**
- * 鑾峰彇瀹℃壒鍒楄〃
+ * 鑾峰彇瀹℃壒鍒楄〃--鍒嗛〉鏌ヨ
* @return
*/
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(approveProcessService.listAll());
+ public AjaxResult list(Page page,String id) {
+ return AjaxResult.success(approveProcessService.listAll(page,id));
}
/**
@@ -94,7 +100,7 @@
* @param ids
* @return
*/
- @PostMapping("/deleteIds")
+ @DeleteMapping("/deleteIds")
public AjaxResult deleteIds(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
--
Gitblit v1.9.3