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,