From f769d817f8ba2522147c73fa93ccacdc3aab0cb6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
index 16acef2..6b3f8c9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
@@ -3,10 +3,13 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.SetDeptDTO;
import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.query.ApprovalListQuery;
import com.ruoyi.system.query.ApprovalNodeListQuery;
+import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.OaApprovalService;
import com.ruoyi.system.vo.system.ApprovalVO;
import io.swagger.annotations.Api;
@@ -14,6 +17,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -29,6 +34,10 @@
public class OaApprovalController {
@Resource
private OaApprovalService oaApprovalService;
+ @Resource
+ private ISysUserService sysUserService;
+ @Resource
+ private TokenService tokenService;
/**
* 获取部门树列表
@@ -38,6 +47,27 @@
public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) {
return R.ok( oaApprovalService.pageList(query));
}
+ @ApiOperation("流程设计不分页列表")
+ @PostMapping("/listAll")
+ public R<List<OaApproval>> listAll() {
+ List<OaApproval> res = new ArrayList<>();
+ List<OaApproval> approvals = oaApprovalService.list();
+ Long userId = tokenService.getLoginUser().getUserId();
+ SysUser sysUser = sysUserService.selectUserById(userId);
+ String deptId = sysUser.getDeptId();
+ for (OaApproval approval : approvals) {
+ if (approval.getDeptIds().equals("-1")){
+ res.add(approval);
+ }else{
+ for (String s : approval.getDeptIds().split(",")) {
+ if (s.equals(deptId)){
+ res.add(approval);
+ }
+ }
+ }
+ }
+ return R.ok(res );
+ }
@ApiOperation(value = "启用禁用")
@GetMapping(value = "/updateStatus")
public R updateStatus(Integer id ) {
--
Gitblit v1.7.1