fix: 1.升级 flowable 版本 2.修复任务列表分页查询数据错误问题

pom.xml

@@ -32,7 +32,7 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
-        <flowable.version>6.5.0</flowable.version>
+        <flowable.version>6.7.2</flowable.version>
         <swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
     </properties>
 	

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowDefinitionServiceImpl.java

@@ -80,7 +80,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
 //                .latestVersion()
                 .orderByProcessDefinitionKey().asc();
         page.setTotal(processDefinitionQuery.count());
-        List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(pageNum - 1, pageSize);
+        List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(pageSize * (pageNum - 1), pageSize);
 
         List<FlowProcDefDto> dataList = new ArrayList<>();
         for (ProcessDefinition processDefinition : processDefinitionList) {

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -86,7 +86,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Override
     public AjaxResult complete(FlowTaskVo taskVo) {
         Task task = taskService.createTaskQuery().taskId(taskVo.getTaskId()).singleResult();
-        if (Objects.isNull(task)){
+        if (Objects.isNull(task)) {
             return AjaxResult.error("任务不存在");
         }
         if (DelegationState.PENDING.equals(task.getDelegationState())) {
@@ -354,7 +354,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Override
     public void deleteTask(FlowTaskVo flowTaskVo) {
         // todo 待确认删除任务是物理删除任务 还是逻辑删除，让这个任务直接通过？
-        taskService.deleteTask(flowTaskVo.getTaskId(),flowTaskVo.getComment());
+        taskService.deleteTask(flowTaskVo.getTaskId(), flowTaskVo.getComment());
     }
 
     /**
@@ -399,7 +399,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void assignTask(FlowTaskVo flowTaskVo) {
-        taskService.setAssignee(flowTaskVo.getTaskId(),flowTaskVo.getComment());
+        taskService.setAssignee(flowTaskVo.getTaskId(), flowTaskVo.getComment());
     }
 
     /**
@@ -417,7 +417,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .startedBy(userId.toString())
                 .orderByProcessInstanceStartTime()
                 .desc();
-        List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(pageNum - 1, pageSize);
+        List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
         page.setTotal(historicProcessInstanceQuery.count());
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (HistoricProcessInstance hisIns : historicProcessInstances) {
@@ -570,7 +570,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 //                .taskAssignee(userId.toString())
                 .orderByTaskCreateTime().desc();
         page.setTotal(taskQuery.count());
-        List<Task> taskList = taskQuery.listPage(pageNum - 1, pageSize);
+        List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
         List<FlowTaskDto> flowList = new ArrayList<>();
         for (Task task : taskList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -623,7 +623,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .taskAssignee(userId.toString())
                 .orderByHistoricTaskInstanceEndTime()
                 .desc();
-        List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageNum - 1, pageSize);
+        List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(pageSize * (pageNum - 1), pageSize);
         List<FlowTaskDto> hisTaskList = Lists.newArrayList();
         for (HistoricTaskInstance histTask : historicTaskInstanceList) {
             FlowTaskDto flowTask = new FlowTaskDto();
@@ -657,7 +657,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);
@@ -868,7 +868,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             List<UserTask> nextUserTask = FindNextNodeUtil.getNextUserTasks(repositoryService, task, new HashMap<>());
             if (CollectionUtils.isNotEmpty(nextUserTask)) {
                 for (UserTask userTask : nextUserTask) {
-                    MultiInstanceLoopCharacteristics   multiInstance =  userTask.getLoopCharacteristics();
+                    MultiInstanceLoopCharacteristics multiInstance = userTask.getLoopCharacteristics();
                     // 会签节点
                     if (Objects.nonNull(multiInstance)) {
                         List<SysUser> list = sysUserService.selectUserList(new SysUser());