From f432c76905d2e98d842f241ac9c55bf770064f5e Mon Sep 17 00:00:00 2001
From: wangli <wangli@axzo.cn>
Date: Sat, 13 Jan 2024 01:04:59 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=BD=AC=E4=BA=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96=20OperationDesc=20=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/CustomCountersignUserTaskCmd.java       | 17 +++++------------
 .../engine/cmd/helper/CustomTaskHelper.java     |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java
index a98ffc48c..717030e2f 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomCountersignUserTaskCmd.java
@@ -7,7 +7,6 @@ import cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper;
 import cn.axzo.workflow.core.service.ExtAxHiTaskInstService;
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.engine.RuntimeService;
@@ -16,15 +15,15 @@ import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.task.api.Task;
 import org.flowable.task.service.impl.persistence.entity.TaskEntity;
-import org.springframework.util.StringUtils;
 
 import java.io.Serializable;
 import java.util.List;
 
-import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_ADVICE;
+import static cn.axzo.workflow.common.constant.BpmnConstants.COMMENT_TYPE_OPERATION_DESC;
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT;
 import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_COMPLETE_OPERATION_TYPE;
 import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.COUNTERSIGN;
+import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.addComment;
 import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.batchAddAttachment;
 import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.createVirtualTask;
 import static cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper.deleteMultiTask;
@@ -161,15 +160,9 @@ public class CustomCountersignUserTaskCmd implements Command<Void>, Serializable
             }
         }
         message.append("等").append(targetTaskAssigneeList.size()).append("人进行审批");
-        createVirtualTask(commandContext, extAxHiTaskInstService, task.getProcessInstanceId(), task.getName(),
-                task.getTaskDefinitionKey(), message.toString(),
-                originTaskAssignee, COUNTERSIGN.getStatus());
-
-        Authentication.setAuthenticatedUserId(originTaskAssignee.buildAssigneeId());
-        if (StringUtils.hasLength(advice)) {
-            taskService.addComment(originTaskId, task.getProcessInstanceId(), COMMENT_TYPE_ADVICE, advice);
-        }
+        Task virtualTask = createVirtualTask(commandContext, extAxHiTaskInstService, task.getProcessInstanceId(), task.getName(),
+                task.getTaskDefinitionKey(), advice, originTaskAssignee, COUNTERSIGN.getStatus());
+        addComment(commandContext, virtualTask, COMMENT_TYPE_OPERATION_DESC, message.toString());
         batchAddAttachment(commandContext, task.getProcessInstanceId(), task.getId(), attachmentList, originTaskAssignee);
-        Authentication.setAuthenticatedUserId(null);
     }
 }
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
index 073ae15dd..4dd6cf893 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/helper/CustomTaskHelper.java
@@ -248,7 +248,7 @@ public class CustomTaskHelper {
                 .filter(i -> Objects.equals(i.getId(), task.getId())).findAny()
                 .ifPresent(i -> i.setAssignee(assigner.buildAssigneeId()));
 
-        // 添加"操作描述"
+        // 添加审批意见
         addAdvice(commandContext, task, advice, assigner.buildAssigneeId());
 
         CustomTaskHelper.createExtTaskInst(extAxHiTaskInstService, task.getProcessInstanceId(), task.getId(),