From 95d8e5f4348497b1eee5884086534c86b1661b4f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 十月 2025 19:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 a87d9c7..6eb5e5d 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,14 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.SecurityUtils;
+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 +18,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -26,10 +31,14 @@
*/
@RestController
@RequestMapping("/oa-approval")
-@Api(tags ="审批流程设计")
+@Api(tags = "审批流程设计")
public class OaApprovalController {
@Resource
private OaApprovalService oaApprovalService;
+ @Resource
+ private ISysUserService sysUserService;
+ @Resource
+ private TokenService tokenService;
/**
* 获取部门树列表
@@ -37,21 +46,45 @@
@ApiOperation("流程设计分页列表")
@PostMapping("/pageList")
public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) {
- return R.ok( oaApprovalService.pageList(query));
+ return R.ok(oaApprovalService.pageList(query));
}
+
@ApiOperation("流程设计不分页列表")
@PostMapping("/listAll")
public R<List<OaApproval>> listAll() {
- return R.ok( oaApprovalService.list());
+ List<OaApproval> res = new ArrayList<>();
+ List<OaApproval> approvals = oaApprovalService.list();
+ Long userId = tokenService.getLoginUser().getUserId();
+ SysUser sysUser = sysUserService.selectUserById(userId);
+
+ if (SecurityUtils.isAdmin(userId) || sysUser.getRoleId() == 1) {
+ return R.ok(approvals);
+ }
+
+ 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 ) {
+ public R updateStatus(Integer id) {
OaApproval approval = oaApprovalService.getById(id);
approval.setStatus(!approval.getStatus());
oaApprovalService.updateById(approval);
return R.ok();
}
+
@ApiOperation(value = "设置使用部门")
@PostMapping(value = "/setDept")
public R setDept(@RequestBody SetDeptDTO dto) {
--
Gitblit v1.7.1