From 14a265e0ce4e7f1f76382bc4678c2aa7a66b9970 Mon Sep 17 00:00:00 2001 From: warm <290631660@qq.com> Date: Mon, 26 May 2025 18:05:47 +0800 Subject: [PATCH] =?UTF-8?q?update=20remove=E5=88=A0=E9=99=A4=E9=80=80?= =?UTF-8?q?=E5=9B=9E=E4=BB=BB=E5=8A=A1bo=E5=85=B3=E4=BA=8E=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E7=9A=84=E8=8A=82=E7=82=B9=E7=9A=84=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20update=20=E4=BD=9C=E5=BA=9F=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8Bid=E7=BB=88=E6=AD=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/workflow/domain/bo/BackProcessBo.java | 1 - .../service/impl/FlwInstanceServiceImpl.java | 15 ++++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java index 3117a33f5..654bf0800 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java @@ -43,7 +43,6 @@ public class BackProcessBo implements Serializable { /** * 驳回的节点id(目前未使用,直接驳回到申请人) */ - @NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class) private String nodeCode; /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index de4d7d5de..40ac21c0d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -422,15 +422,12 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { if (instance != null) { BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus()); } - List flowTaskList = flwTaskService.selectByInstId(bo.getId()); - for (FlowTask flowTask : flowTaskList) { - FlowParams flowParams = FlowParams.build() - .message(bo.getComment()) - .flowStatus(BusinessStatusEnum.INVALID.getStatus()) - .hisStatus(TaskStatusEnum.INVALID.getStatus()) - .ignore(true); - taskService.termination(flowTask.getId(), flowParams); - } + FlowParams flowParams = FlowParams.build() + .message(bo.getComment()) + .flowStatus(BusinessStatusEnum.INVALID.getStatus()) + .hisStatus(TaskStatusEnum.INVALID.getStatus()) + .ignore(true); + taskService.terminationByInsId(bo.getId(), flowParams); return true; } catch (Exception e) { log.error(e.getMessage(), e);