From 3022396404bfe8f15a1a4172100cb7a63b53cde3 Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: Fri, 11 Feb 2022 10:10:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=9B=BE=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/workflow/FlowDefinitionController.java | 2 +-
 .../com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java    | 1 +
 ruoyi-ui/src/views/workflow/task/finished/index.vue             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java
index 822fc33e..58eaafb9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/FlowDefinitionController.java
@@ -95,7 +95,7 @@ public class FlowDefinitionController extends BaseController {
         try {
             return R.ok(flowDefinitionService.readXml(definitionId), null);
         } catch (Exception e) {
-            return R.fail("加载xml文件异常", null);
+            return R.fail("加载xml文件异常");
         }
 
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
index 54084e1c..62da1f90 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowTaskServiceImpl.java
@@ -694,6 +694,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             for (HistoricActivityInstance histIns : list) {
                 if (StringUtils.isNotBlank(histIns.getTaskId())) {
                     FlowTaskDto flowTask = new FlowTaskDto();
+                    flowTask.setProcDefId(histIns.getProcessDefinitionId());
                     flowTask.setTaskId(histIns.getTaskId());
                     flowTask.setTaskName(histIns.getActivityName());
                     flowTask.setCreateTime(histIns.getStartTime());
diff --git a/ruoyi-ui/src/views/workflow/task/finished/index.vue b/ruoyi-ui/src/views/workflow/task/finished/index.vue
index 24916502..e7ce68f1 100644
--- a/ruoyi-ui/src/views/workflow/task/finished/index.vue
+++ b/ruoyi-ui/src/views/workflow/task/finished/index.vue
@@ -206,6 +206,7 @@ export default {
     handleFlowRecord(row){
       this.$router.push({ path: '/task/record/index',
         query: {
+          definitionId: row.procDefId,
           procInsId: row.procInsId,
           deployId: row.deployId,
           taskId: row.taskId,