From 90b508eaf3c86120165e6564efa7e7c64e32d732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 27 May 2025 17:17:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=80=80=E5=9B=9E=E4=BB=BB=E5=8A=A1bo=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E9=A9=B3=E5=9B=9E=E7=9A=84=E8=8A=82=E7=82=B9=E7=9A=84?=
 =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/workflow/domain/bo/BackProcessBo.java |  2 --
 .../service/impl/FlwInstanceServiceImpl.java      | 15 ++++++---------
 2 files changed, 6 insertions(+), 11 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 3117a33f..a67a1f78 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
@@ -1,6 +1,5 @@
 package org.dromara.workflow.domain.bo;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.dromara.common.core.validate.AddGroup;
@@ -43,7 +42,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 172d05e8..020d7e69 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<FlowTask> 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);