From f6760448428b0a11aebab4ee281023532e4f61d7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 27 十月 2025 19:53:56 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 6b3f8c9..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
@@ -4,6 +4,7 @@
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;
@@ -30,7 +31,7 @@
*/
@RestController
@RequestMapping("/oa-approval")
-@Api(tags ="审批流程设计")
+@Api(tags = "审批流程设计")
public class OaApprovalController {
@Resource
private OaApprovalService oaApprovalService;
@@ -45,8 +46,9 @@
@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() {
@@ -54,28 +56,35 @@
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")){
+ if (approval.getDeptIds().equals("-1")) {
res.add(approval);
- }else{
+ } else {
for (String s : approval.getDeptIds().split(",")) {
- if (s.equals(deptId)){
+ if (s.equals(deptId)) {
res.add(approval);
}
}
}
}
- return R.ok(res );
+ 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