From 666ea6e0100b4b2411488daf49e517e91b3c2110 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Fri, 10 Feb 2023 00:19:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9E=E5=85=AC=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E6=B5=81=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=BD=93=E5=89=8D=E8=8A=82=E7=82=B9=E6=97=A0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=8A=9E?=
 =?UTF-8?q?=E7=90=86=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WfProcessServiceImpl.java    | 20 ++++---------------
 ruoyi-ui/src/views/workflow/work/own.vue      |  8 +-------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
index 5fd5a26d..f3813c67 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java
@@ -188,15 +188,9 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
             taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion());
             taskVo.setCategory(deployment.getCategory());
             // 当前所处流程
-            List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list();
+            List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).includeIdentityLinks().list();
             if (CollUtil.isNotEmpty(taskList)) {
-                taskVo.setTaskId(taskList.get(0).getId());
-            } else {
-                List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
-                    .processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
-                if (CollUtil.isNotEmpty(historicTaskInstance)) {
-                    taskVo.setTaskId(historicTaskInstance.get(0).getId());
-                }
+                taskVo.setTaskName(taskList.stream().map(Task::getName).filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
             }
             taskVoList.add(taskVo);
         }
@@ -235,15 +229,9 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce
             taskVo.setProcDefVersion(hisIns.getProcessDefinitionVersion());
             taskVo.setCategory(deployment.getCategory());
             // 当前所处流程
-            List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).list();
+            List<Task> taskList = taskService.createTaskQuery().processInstanceId(hisIns.getId()).includeIdentityLinks().list();
             if (CollUtil.isNotEmpty(taskList)) {
-                taskVo.setTaskId(taskList.get(0).getId());
-            } else {
-                List<HistoricTaskInstance> historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
-                        .processInstanceId(hisIns.getId()).orderByHistoricTaskInstanceEndTime().desc().list();
-                if (CollUtil.isNotEmpty(historicTaskInstance)) {
-                    taskVo.setTaskId(historicTaskInstance.get(0).getId());
-                }
+                taskVo.setTaskName(taskList.stream().map(Task::getName).filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
             }
             taskVoList.add(taskVo);
         }
diff --git a/ruoyi-ui/src/views/workflow/work/own.vue b/ruoyi-ui/src/views/workflow/work/own.vue
index 2e97f615..63a063fc 100644
--- a/ruoyi-ui/src/views/workflow/work/own.vue
+++ b/ruoyi-ui/src/views/workflow/work/own.vue
@@ -81,6 +81,7 @@
           <el-tag size="medium" >v{{ scope.row.procDefVersion }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="当前节点" align="center" prop="taskName"/>
       <el-table-column label="提交时间" align="center" prop="createTime" width="180"/>
       <el-table-column label="流程状态" align="center" width="100">
         <template slot-scope="scope">
@@ -89,13 +90,6 @@
         </template>
       </el-table-column>
       <el-table-column label="耗时" align="center" prop="duration" width="180"/>
-      <el-table-column label="当前节点" align="center" prop="taskName"/>
-      <el-table-column label="办理" align="center">
-        <template slot-scope="scope">
-          <label v-if="scope.row.assigneeName">{{scope.row.assigneeName}} <el-tag type="info" size="mini">{{scope.row.deptName}}</el-tag></label>
-          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>
-        </template>
-      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button