From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
index aa29012..25724b6 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
@@ -21,6 +21,7 @@
import org.dromara.workflow.service.IWfTaskBackNodeService;
import org.dromara.workflow.utils.QueryUtils;
import org.flowable.engine.TaskService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -38,11 +39,10 @@
@RequestMapping("/workflow/task")
public class ActTaskController extends BaseController {
+ @Autowired(required = false)
+ private TaskService taskService;
private final IActTaskService actTaskService;
-
- private final TaskService taskService;
-
- private final IWfTaskBackNodeService iWfTaskBackNodeService;
+ private final IWfTaskBackNodeService wfTaskBackNodeService;
/**
@@ -225,7 +225,7 @@
@RepeatSubmit()
@PostMapping("/backProcess")
public R<String> backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo backProcessBo) {
- return R.ok(actTaskService.backProcess(backProcessBo));
+ return R.ok("鎿嶄綔鎴愬姛", actTaskService.backProcess(backProcessBo));
}
/**
@@ -269,6 +269,27 @@
*/
@GetMapping("/getTaskNodeList/{processInstanceId}")
public R<List<WfTaskBackNode>> getNodeList(@PathVariable String processInstanceId) {
- return R.ok(CollUtil.reverse(iWfTaskBackNodeService.getListByInstanceId(processInstanceId)));
+ return R.ok(CollUtil.reverse(wfTaskBackNodeService.getListByInstanceId(processInstanceId)));
}
+
+ /**
+ * 鏌ヨ宸ヤ綔娴佷换鍔＄敤鎴烽�夋嫨鍔犵浜哄憳
+ *
+ * @param taskId 浠诲姟id
+ */
+ @GetMapping("/getTaskUserIdsByAddMultiInstance/{taskId}")
+ public R<String> getTaskUserIdsByAddMultiInstance(@PathVariable String taskId) {
+ return R.ok("鎿嶄綔鎴愬姛", actTaskService.getTaskUserIdsByAddMultiInstance(taskId));
+ }
+
+ /**
+ * 鏌ヨ宸ヤ綔娴侀�夋嫨鍑忕浜哄憳
+ *
+ * @param taskId 浠诲姟id
+ */
+ @GetMapping("/getListByDeleteMultiInstance/{taskId}")
+ public R<List<TaskVo>> getListByDeleteMultiInstance(@PathVariable String taskId) {
+ return R.ok(actTaskService.getListByDeleteMultiInstance(taskId));
+ }
+
}
--
Gitblit v1.9.3