From cc1c6d9920abdd8d9ae6321e414f570973b9eddf Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 10 Dec 2024 11:23:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-3383)=20-=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E8=8A=82=E7=82=B9=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java  | 2 +-
 .../axzo/workflow/core/service/ExtAxProcessLogService.java  | 5 +++++
 .../core/service/impl/ExtAxProcessLogServiceImpl.java       | 6 +++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java
index 4a1d94c7c..240fa6d0f 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCreateDummyTaskCmd.java
@@ -136,7 +136,7 @@ public class CustomCreateDummyTaskCmd extends AbstractCommand<String> implements
         CustomTaskHelper.createExtTaskInst(extAxHiTaskInstService, processInstanceId, task.getId(),
                 NODE_ROBOT.getType(),
                 Objects.isNull(operator) ? BpmnTaskDelegateAssigner.buildDummyAssigner("system",
-                        TASK_ASSIGNEE_SKIP_FLAT, "系统") : operator,
+                        TASK_ASSIGNEE_SKIP_FLAT, "") : operator,
                 BpmnProcessInstanceResultEnum.PROCESSING.getStatus());
         return task.getId();
     }
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxProcessLogService.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxProcessLogService.java
index d3f4a6859..238a57e8c 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxProcessLogService.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxProcessLogService.java
@@ -55,6 +55,11 @@ public interface ExtAxProcessLogService {
 
     List<ExtAxProcessLog> genericQuery(ExtAxProcessLog query);
 
+    /**
+     * 机器人节点会删除日志，这里仅仅为了恢复日志都删除标识，并更新时间。
+     * @param processInstanceId
+     * @param taskId
+     */
     void restore(String processInstanceId, String taskId);
 
     void batchRestore(List<SimpleTaskDTO> tasks);
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java
index 4dccf3f5b..19a05ef20 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxProcessLogServiceImpl.java
@@ -90,7 +90,11 @@ public class ExtAxProcessLogServiceImpl implements ExtAxProcessLogService {
         if (CollectionUtils.isEmpty(tasks)) {
             return;
         }
-        tasks.forEach(task -> extAxProcessLogMapper.restore(task.getProcessInstanceId(), task.getTaskId()));
+        tasks.forEach(task -> {
+            if (StringUtils.hasText(task.getProcessInstanceId()) && StringUtils.hasText(task.getTaskId())) {
+                extAxProcessLogMapper.restore(task.getProcessInstanceId(), task.getTaskId());
+            }
+        });
     }
 
     LambdaQueryWrapper<ExtAxProcessLog> buildQueryWrapper(ExtAxProcessLog log) {