From 945202652af6fc0267a718196104e41fb0caab67 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期三, 27 三月 2024 21:15:42 +0800
Subject: [PATCH] update 调整工作流分页返回参数
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 0d584c8..58c7b8a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -22,10 +22,7 @@
import org.dromara.workflow.domain.ActHiTaskinst;
import org.dromara.workflow.domain.WfTaskBackNode;
import org.dromara.workflow.domain.bo.*;
-import org.dromara.workflow.domain.vo.MultiInstanceVo;
-import org.dromara.workflow.domain.vo.TaskVo;
-import org.dromara.workflow.domain.vo.VariableVo;
-import org.dromara.workflow.domain.vo.WfCopy;
+import org.dromara.workflow.domain.vo.*;
import org.dromara.workflow.flowable.cmd.*;
import org.dromara.workflow.flowable.strategy.FlowEventStrategy;
import org.dromara.workflow.flowable.strategy.FlowProcessEventHandler;
@@ -284,7 +281,7 @@
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
- return new TableDataInfo<>(taskList, page.getTotal());
+ return TableDataInfo.build(page);
}
private String getInParam(List<String> param) {
@@ -346,7 +343,10 @@
WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);
}
long count = query.count();
- return new TableDataInfo<>(list, count);
+ TableDataInfo<TaskVo> build = TableDataInfo.build();
+ build.setRows(list);
+ build.setTotal(count);
+ return build;
}
/**
@@ -372,7 +372,7 @@
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
- return new TableDataInfo<>(taskList, page.getTotal());
+ return TableDataInfo.build(page);
}
/**
@@ -404,7 +404,7 @@
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
- return new TableDataInfo<>(taskList, page.getTotal());
+ return TableDataInfo.build(page);
}
/**
@@ -428,7 +428,7 @@
List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
WorkflowUtils.setWfFormDefinitionVo(taskList, processDefinitionIds, PROCESS_DEFINITION_ID);
}
- return new TableDataInfo<>(taskList, page.getTotal());
+ return TableDataInfo.build(page);
}
/**
--
Gitblit v1.9.3