From 2b82b1e1d31671b8581d2e463ad762bdf63dad30 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 十月 2025 16:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 e6339f8..a87d9c7 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
@@ -1,20 +1,13 @@
package com.ruoyi.web.controller.api;
-import com.ruoyi.common.annotation.Log;
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.core.domain.entity.TDept;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.dto.AddDeptDTO;
import com.ruoyi.system.dto.SetDeptDTO;
-import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.system.model.OaApproval;
import com.ruoyi.system.query.ApprovalListQuery;
-import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.query.ApprovalNodeListQuery;
import com.ruoyi.system.service.OaApprovalService;
-import com.ruoyi.system.service.TDeptService;
import com.ruoyi.system.vo.system.ApprovalVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +15,6 @@
import javax.annotation.Resource;
import java.util.List;
-import java.util.stream.Collectors;
/**
* <p>
@@ -47,6 +39,11 @@
public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) {
return R.ok( oaApprovalService.pageList(query));
}
+ @ApiOperation("流程设计不分页列表")
+ @PostMapping("/listAll")
+ public R<List<OaApproval>> listAll() {
+ return R.ok( oaApprovalService.list());
+ }
@ApiOperation(value = "启用禁用")
@GetMapping(value = "/updateStatus")
public R updateStatus(Integer id ) {
--
Gitblit v1.7.1