From ecfaa9ad5c83be221e9baabfe2e5c8647899b7d5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 02 八月 2024 17:09:46 +0800
Subject: [PATCH] update 优化 角色权限判断
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 d494959..75f9d9b 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
@@ -42,7 +42,7 @@
private final TaskService taskService;
- private final IWfTaskBackNodeService iWfTaskBackNodeService;
+ private final IWfTaskBackNodeService wfTaskBackNodeService;
/**
@@ -53,7 +53,7 @@
@Log(title = "浠诲姟绠＄悊", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/startWorkFlow")
- public R<Map<String, Object>> startWorkFlow(@RequestBody StartProcessBo startProcessBo) {
+ public R<Map<String, Object>> startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) {
Map<String, Object> map = actTaskService.startWorkFlow(startProcessBo);
return R.ok("鎻愪氦鎴愬姛", map);
}
@@ -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