From f0368395d1049733e3b77a621cb7aab48f403220 Mon Sep 17 00:00:00 2001
From: songgaoshuai <1742057357@qq.com>
Date: Fri, 14 Jul 2023 13:27:26 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=9C=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ActProcessInstanceServiceImpl.java       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index 380a1cac4..7ba500e5b 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -309,10 +309,6 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
         }
         //节点图形信息
         map.put("graphicInfoVos", graphicInfoVos);
-        //作废理由
-        HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId)
-            .processInstanceTenantId(TenantHelper.getTenantId()).singleResult();
-        map.put("deleteReason", historicProcessInstance.getDeleteReason());
         return map;
     }
 
@@ -359,15 +355,18 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
             if (CollUtil.isNotEmpty(subTasks)) {
                 subTasks.forEach(e -> taskService.deleteTask(e.getId()));
             }
+            String deleteReason = LoginHelper.getUsername() + "作废了当前申请！";
+            if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) {
+                deleteReason = LoginHelper.getUsername() + "作废理由:" + processInvalidBo.getDeleteReason();
+            }
+            for (Task task : StreamUtils.filter(list, e -> StringUtils.isBlank(e.getParentTaskId()))) {
+                taskService.addComment(task.getId(), task.getProcessInstanceId(), TaskStatusEnum.INVALID.getStatus(), deleteReason);
+            }
             HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
                 .processInstanceBusinessKey(processInvalidBo.getProcessInstanceId()).processInstanceTenantId(TenantHelper.getTenantId()).singleResult();
             if (ObjectUtil.isNotEmpty(historicProcessInstance)) {
                 BusinessStatusEnum.checkStatus(historicProcessInstance.getBusinessStatus());
             }
-            String deleteReason = LoginHelper.getUsername() + "作废了当前申请！";
-            if (StringUtils.isNotBlank(processInvalidBo.getDeleteReason())) {
-                deleteReason = LoginHelper.getUsername() + "作废理由:" + processInvalidBo.getDeleteReason();
-            }
             runtimeService.updateBusinessStatus(processInvalidBo.getProcessInstanceId(), BusinessStatusEnum.INVALID.getStatus());
             runtimeService.deleteProcessInstance(processInvalidBo.getProcessInstanceId(), deleteReason);
             return true;