From 994de50e9d1ea611b11ea77bd8f2279ff94b68f0 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Tue, 1 Mar 2022 21:17:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowDefinitionServiceImpl.java       |  6 ++++--
 .../workflow/service/impl/FlowTaskServiceImpl.java    | 11 +++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowDefinitionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowDefinitionServiceImpl.java
index b440227a..981dcb5a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowDefinitionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowDefinitionServiceImpl.java
@@ -74,7 +74,8 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
         if (pageTotal <= 0) {
             return TableDataInfo.build();
         }
-        List<ProcessDefinition> definitionList = processDefinitionQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+        int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
+        List<ProcessDefinition> definitionList = processDefinitionQuery.listPage(offset, pageQuery.getPageSize());
 
         List<FlowDefinitionVo> definitionVoList = new ArrayList<>();
         for (ProcessDefinition processDefinition : definitionList) {
@@ -115,8 +116,9 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
             return TableDataInfo.build();
         }
         // 根据查询条件，查询所有版本
+        int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
         List<ProcessDefinition> processDefinitionList = processDefinitionQuery
-            .listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+            .listPage(offset, pageQuery.getPageSize());
         List<FlowDefinitionVo> flowDefinitionVoList = processDefinitionList.stream().map(item -> {
             FlowDefinitionVo vo = new FlowDefinitionVo();
             vo.setDefinitionId(item.getId());
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 eb53a13a..4f9652a1 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
@@ -420,8 +420,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             .startedBy(userId.toString())
             .orderByProcessInstanceStartTime()
             .desc();
+        int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
         List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery
-            .listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+            .listPage(offset, pageQuery.getPageSize());
         page.setTotal(historicProcessInstanceQuery.count());
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (HistoricProcessInstance hisIns : historicProcessInstances) {
@@ -564,7 +565,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             .taskCandidateOrAssigned(userId.toString())
             .orderByTaskCreateTime().desc();
         page.setTotal(taskQuery.count());
-        List<Task> taskList = taskQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+        int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
+        List<Task> taskList = taskQuery.listPage(offset, pageQuery.getPageSize());
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (Task task : taskList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -615,7 +617,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             .taskAssignee(userId.toString())
             .orderByHistoricTaskInstanceEndTime()
             .desc();
-        List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
+        int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1);
+        List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(offset, pageQuery.getPageSize());
         List<FlowTaskDto> hisTaskList = Lists.newArrayList();
         for (HistoricTaskInstance histTask : historicTaskInstanceList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -649,7 +652,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartDeptName(startUser.getDept().getDeptName());
             hisTaskList.add(flowTask);
         }
-        page.setTotal(hisTaskList.size());
+        page.setTotal(taskInstanceQuery.count());
         page.setRecords(hisTaskList);
 //        Map<String, Object> result = new HashMap<>();
 //        result.put("result",page);