From b0cd1f8646fc8dcc86e1cea60d7d55e446fee4b8 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Wed, 19 Jun 2024 20:21:59 +0800
Subject: [PATCH] =?UTF-8?q?update(REQ-2516)=20-=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=8C=87=E5=AE=9A=E5=AE=A1=E6=89=B9=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/common/code/BpmnTaskRespCode.java    |  1 +
 .../CustomBizSpecifyAssigneeToTaskCmd.java    | 24 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
index cd2775b32..e3b3b5616 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/code/BpmnTaskRespCode.java
@@ -33,6 +33,7 @@ public enum BpmnTaskRespCode implements IModuleRespCode {
     FIND_TASK_BY_PERSON_ID_ERROR("018", "流程实例中:【{}】未查找指定自然人:【{}】的待处理的流程任务!"),
     PROCESS_INSTANCE_IS_NOT_EXIST("019", "Execution:{} 对应流程实例不存在，流程状态异常!"),
     TASK_TYPE_MISMATCH("020", "节点类型不匹配，当前节点类型：【{}】,指定节点类型：【{}】!"),
+    PROCESS_CANT_SET_ASSIGNEE("021", "当前审批状态不允许设置审批人"),
     ;
 
     private String code;
diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java
index 76cba22d2..543c0eb20 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomBizSpecifyAssigneeToTaskCmd.java
@@ -5,8 +5,10 @@ import cn.axzo.workflow.core.common.exception.WorkflowEngineException;
 import cn.axzo.workflow.core.engine.cmd.helper.CustomTaskHelper;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
+import org.flowable.engine.HistoryService;
 import org.flowable.engine.RuntimeService;
 import org.flowable.engine.TaskService;
+import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.util.CommandContextUtil;
 import org.flowable.task.api.Task;
@@ -22,8 +24,10 @@ import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_R
 import static cn.axzo.workflow.common.constant.BpmnConstants.NO_ASSIGNEE;
 import static cn.axzo.workflow.common.constant.BpmnConstants.TASK_COMPLETE_OPERATION_TYPE;
 import static cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum.DELETED;
+import static cn.axzo.workflow.core.common.code.BpmnInstanceRespCode.PROCESS_INSTANCE_ID_NOT_EXISTS;
 import static cn.axzo.workflow.core.common.code.BpmnTaskRespCode.ACTIVITY_BIZ_SET_ASSIGNEE_ERROR;
 import static cn.axzo.workflow.core.common.code.BpmnTaskRespCode.ACTIVITY_CANT_SET_ASSIGNEE;
+import static cn.axzo.workflow.core.common.code.BpmnTaskRespCode.PROCESS_CANT_SET_ASSIGNEE;
 
 /**
  * 自定的业务指定审批人命令实现
@@ -53,6 +57,8 @@ public class CustomBizSpecifyAssigneeToTaskCmd implements Command<Boolean>, Seri
 
         validTask(task);
 
+        validProcessInstance(commandContext, task);
+
         changeAssigneeSnapshot(commandContext, task);
 
         addAssignee(commandContext, taskService, task);
@@ -60,6 +66,20 @@ public class CustomBizSpecifyAssigneeToTaskCmd implements Command<Boolean>, Seri
         return true;
     }
 
+    private void validProcessInstance(CommandContext commandContext, Task task) {
+        ProcessEngineConfigurationImpl processEngineConfiguration =
+                CommandContextUtil.getProcessEngineConfiguration(commandContext);
+        HistoryService historyService = processEngineConfiguration.getHistoryService();
+        HistoricProcessInstance processInstance = historyService.createHistoricProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+        if (Objects.isNull(processInstance)) {
+            throw new WorkflowEngineException(PROCESS_INSTANCE_ID_NOT_EXISTS, task.getProcessInstanceId());
+        }
+        if (!Objects.equals("PROCESSING", processInstance.getBusinessStatus())) {
+            throw new WorkflowEngineException(PROCESS_CANT_SET_ASSIGNEE);
+        }
+    }
+
+
     private void changeAssigneeSnapshot(CommandContext commandContext, Task task) {
         ProcessEngineConfigurationImpl processEngineConfiguration =
                 CommandContextUtil.getProcessEngineConfiguration(commandContext);
@@ -85,9 +105,7 @@ public class CustomBizSpecifyAssigneeToTaskCmd implements Command<Boolean>, Seri
             return;
         }
 
-        addedAssigners.forEach(i -> {
-            CustomTaskHelper.addMultiTask(commandContext, (TaskEntity) task, i);
-        });
+        addedAssigners.forEach(i -> CustomTaskHelper.addMultiTask(commandContext, (TaskEntity) task, i));
 
         taskService.setAssignee(task.getId(), HIDDEN_ASSIGNEE_ID);
         ((TaskEntity) task).setTransientVariable(TASK_COMPLETE_OPERATION_TYPE + task.getId(), DELETED.getStatus());