From a199211d06c73d00e32afca40bde56b250a999d0 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Fri, 22 Apr 2022 18:43:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=A1=E6=89=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=80=99=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=8E=A5=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 .../service/impl/FlowTaskServiceImpl.java     |  1 +
 .../views/flowable/task/record/flowview.vue   |  1 -
 .../src/views/flowable/task/record/index.vue  | 32 ++++++++++---------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 6ab29b5..acdfce8 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ GitHub：https://github.com/tony2y/RuoYi-flowable.git
 <img src="https://images.gitee.com/uploads/images/2022/0422/180040_cbfd08db_2042292.png"/>
 <img src="https://images.gitee.com/uploads/images/2022/0422/180059_b43a6ebe_2042292.png"/>
 <img src="https://images.gitee.com/uploads/images/2022/0422/180232_f940c940_2042292.png"/>
+<img src="https://images.gitee.com/uploads/images/2022/0422/182121_31ed0d5a_2042292.png"/>
 <img src="https://images.gitee.com/uploads/images/2022/0422/180315_122eb523_2042292.png"/>
 <img src="https://images.gitee.com/uploads/images/2022/0422/180200_6092c5e2_2042292.png"/>
 
diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
index 9738125..003ae89 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
@@ -707,6 +707,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId());
                     StringBuilder stringBuilder = new StringBuilder();
                     for (HistoricIdentityLink identityLink : linksForTask) {
+                        // 获选人,候选组/角色(多个)
                         if ("candidate".equals(identityLink.getType())) {
                             if (StringUtils.isNotBlank(identityLink.getUserId())) {
                                 SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
diff --git a/ruoyi-ui/src/views/flowable/task/record/flowview.vue b/ruoyi-ui/src/views/flowable/task/record/flowview.vue
index 0542f63..6912a02 100644
--- a/ruoyi-ui/src/views/flowable/task/record/flowview.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/flowview.vue
@@ -127,7 +127,6 @@ export default {
           if (completeTask) {
             canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
             n.outgoing?.forEach(nn => {
-              debugger
               const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
               if (targetTask) {
                 canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
diff --git a/ruoyi-ui/src/views/flowable/task/record/index.vue b/ruoyi-ui/src/views/flowable/task/record/index.vue
index f0cc653..edefcd4 100644
--- a/ruoyi-ui/src/views/flowable/task/record/index.vue
+++ b/ruoyi-ui/src/views/flowable/task/record/index.vue
@@ -97,7 +97,7 @@
         <el-form-item  v-if="checkSendUser" prop="targetKey">
           <el-row :gutter="20">
             <!--部门数据-->
-            <el-col :span="4" :xs="24">
+            <el-col :span="6" :xs="24">
               <h6>部门列表</h6>
               <div class="head-container">
                 <el-input
@@ -121,7 +121,7 @@
                 />
               </div>
             </el-col>
-            <el-col :span="12" :xs="24">
+            <el-col :span="10" :xs="24">
               <h6>待选人员</h6>
               <el-table
                 ref="singleTable"
@@ -137,11 +137,11 @@
             <el-col :span="8" :xs="24">
               <h6>已选人员</h6>
               <el-tag
-                v-for="tag in userData"
-                :key="tag"
+                v-for="(user,index) in userData"
+                :key="index"
                 closable
-                @close="handleClose(tag)">
-                {{tag.nickName}} {{tag.dept.deptName}}
+                @close="handleClose(user)">
+                {{user.nickName}} {{user.dept.deptName}}
               </el-tag>
             </el-col>
           </el-row>
@@ -344,15 +344,17 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.userData = selection
-      const val = selection.map(item => item.userId)[0];
-      if (val instanceof Array) {
-        this.taskForm.values = {
-          "approval": val.join(',')
-        }
-      } else {
-        this.taskForm.values = {
-          "approval": val
+      if (selection) {
+        this.userData = selection
+        const selectVal = selection.map(item => item.userId);
+        if (selectVal instanceof Array) {
+          this.taskForm.values = {
+            "approval": selectVal.join(',')
+          }
+        } else {
+          this.taskForm.values = {
+            "approval": selectVal
+          }
         }
       }
     },