From 189845dc4ac4f5b7b9ae3108508f29145d9113f1 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Thu, 12 Dec 2024 09:10:14 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=BF=80=E6=B4=BB/?= =?UTF-8?q?=E6=8C=82=E8=B5=B7=E5=8F=96=E5=8F=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwDefinitionController.java | 2 +- .../workflow/controller/FlwInstanceController.java | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 8178b9604..2030f280c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -178,7 +178,7 @@ public class FlwDefinitionController extends BaseController { */ @PutMapping("/active/{id}") public R active(@PathVariable Long id, @RequestParam boolean active) { - return R.ok(active ? defService.unActive(id) : defService.active(id)); + return R.ok(active ? defService.active(id) : defService.unActive(id)); } } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index 91bb4e0cc..d446bae9e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -31,7 +31,6 @@ import java.util.Map; @RestController @RequestMapping("/workflow/instance") public class FlwInstanceController extends BaseController { - private final IFlwInstanceService flwInstanceService; private final InsService insService; @@ -88,21 +87,16 @@ public class FlwInstanceController extends BaseController { } /** - * 激活/挂起流程定义 + * 激活/挂起流程实例 * - * @param id 流程定义id + * @param id 流程实例id * @param active 激活/挂起 */ @PutMapping("/active/{id}") public R active(@PathVariable Long id, @RequestParam boolean active) { - if (active) { - return R.ok(insService.unActive(id)); - } else { - return R.ok(insService.active(id)); - } + return R.ok(active ? insService.active(id) : insService.unActive(id)); } - /** * 获取当前登陆人发起的流程实例 * @@ -114,7 +108,6 @@ public class FlwInstanceController extends BaseController { return flwInstanceService.pageByCurrent(flowInstanceBo, pageQuery); } - /** * 获取流程图，流程记录 *