From 4cea80a5aaf11dc1096fdac1ece251a69b3f0ad3 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Sat, 2 Jul 2022 01:44:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E6=8A=84=E9=80=81?=
 =?UTF-8?q?=E4=BA=BA=E8=8E=B7=E5=8F=96=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?NPL=E5=92=8C=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4=E6=8A=84?=
 =?UTF-8?q?=E9=80=81=E4=BA=BA=E6=A0=87=E7=AD=BE=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/service/impl/WfCopyServiceImpl.java | 16 ++++++++--------
 ruoyi-ui/src/views/workflow/work/detail.vue      | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java
index 6abf28bc..bca07ab3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfCopyServiceImpl.java
@@ -14,8 +14,8 @@ import com.ruoyi.workflow.domain.vo.WfCopyVo;
 import com.ruoyi.workflow.mapper.WfCopyMapper;
 import com.ruoyi.workflow.service.IWfCopyService;
 import lombok.RequiredArgsConstructor;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.history.HistoricProcessInstance;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -34,7 +34,7 @@ public class WfCopyServiceImpl implements IWfCopyService {
 
     private final WfCopyMapper baseMapper;
 
-    private final RuntimeService runtimeService;
+    private final HistoryService historyService;
 
     /**
      * 查询流程抄送
@@ -88,20 +88,20 @@ public class WfCopyServiceImpl implements IWfCopyService {
             // 若抄送用户为空，则不需要处理，返回成功
             return true;
         }
-        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
+        HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
             .processInstanceId(taskBo.getInstanceId()).singleResult();
         String[] ids = taskBo.getCopyUserIds().split(",");
         List<WfCopy> copyList = new ArrayList<>(ids.length);
         Long originatorId = LoginHelper.getUserId();
         String originatorName = LoginHelper.getNickName();
-        String title = processInstance.getProcessDefinitionName() + "-" + taskBo.getTaskName();
+        String title = historicProcessInstance.getProcessDefinitionName() + "-" + taskBo.getTaskName();
         for (String id : ids) {
             Long userId = Long.valueOf(id);
             WfCopy copy = new WfCopy();
             copy.setTitle(title);
-            copy.setProcessId(processInstance.getProcessDefinitionId());
-            copy.setProcessName(processInstance.getProcessDefinitionName());
-            copy.setDeploymentId(processInstance.getDeploymentId());
+            copy.setProcessId(historicProcessInstance.getProcessDefinitionId());
+            copy.setProcessName(historicProcessInstance.getProcessDefinitionName());
+            copy.setDeploymentId(historicProcessInstance.getDeploymentId());
             copy.setInstanceId(taskBo.getInstanceId());
             copy.setTaskId(taskBo.getTaskId());
             copy.setUserId(userId);
diff --git a/ruoyi-ui/src/views/workflow/work/detail.vue b/ruoyi-ui/src/views/workflow/work/detail.vue
index d287bd3b..36d9d29c 100644
--- a/ruoyi-ui/src/views/workflow/work/detail.vue
+++ b/ruoyi-ui/src/views/workflow/work/detail.vue
@@ -408,6 +408,13 @@ export default {
       let userObj = this.userMultipleSelection.find(item => item.userId === tag.id);
       this.userMultipleSelection.splice(this.userMultipleSelection.indexOf(userObj), 1);
       this.userData.copyUser.splice(this.userData.copyUser.indexOf(tag), 1);
+      // 设置抄送人ID
+      if (this.userData.copyUser && this.userData.copyUser.length > 0) {
+        const val = this.userData.copyUser.map(item => item.id);
+        this.taskForm.copyUserIds = val instanceof Array ? val.join(',') : val;
+      } else {
+        this.taskForm.copyUserIds = '';
+      }
     },
     /** 流程变量赋值 */
     handleCheckChange(val) {
@@ -574,13 +581,6 @@ export default {
           this.$modal.msgError("请选择用户");
           return false;
         }
-        // 若有选择抄送用户，获取抄送用户ID
-        if (this.userData.copyUser && this.userData.copyUser.length > 0) {
-          const val = this.userData.copyUser.map(item => item.id);
-          this.taskForm.copyUserIds = val instanceof Array ? val.join(',') : val;
-        } else {
-          this.taskForm.copyUserIds = '';
-        }
         this.taskForm.userId = this.currentUserId;
         if (type === 'delegate') {
           delegate(this.taskForm).then(res => {