diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiProcdefServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiProcdefServiceImpl.java index 7b15482d..9a6d0df2 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiProcdefServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiProcdefServiceImpl.java @@ -45,7 +45,7 @@ public class ActivitiProcdefServiceImpl extends DefaultBaseService implements IA @Override public SuccessResultList> listPage(int page, int rows) { ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); - List processDefinitions = processDefinitionQuery.orderByDeploymentId().asc().listPage(page - 1, rows); + List processDefinitions = processDefinitionQuery.orderByDeploymentId().asc().listPage((page - 1) * rows, rows); List activitiProcdefDTOs = new ArrayList<>(); processDefinitions.forEach(processDefinition -> { diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java index fbe7034d..4ab7a509 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java @@ -167,7 +167,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti @Override public SuccessResultList> listPage(int page, int rows) { ModelQuery modelQuery = repositoryService.createModelQuery(); - List models = modelQuery.orderByCreateTime().desc().listPage(page - 1, rows); + List models = modelQuery.orderByCreateTime().desc().listPage((page - 1) * rows, rows); return new SuccessResultList<>(listModelDTO(models), page, modelQuery.count()); } @@ -177,7 +177,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti return listPage(page, rows); } ModelQuery modelQuery = repositoryService.createModelQuery(); - List models = modelQuery.modelCategory(modelCategory).orderByCreateTime().desc().listPage(page - 1, rows); + List models = modelQuery.modelCategory(modelCategory).orderByCreateTime().desc().listPage((page - 1) * rows, rows); return new SuccessResultList<>(listModelDTO(models), page, modelQuery.count()); } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java index d0d4b5e6..468d309f 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java @@ -84,7 +84,7 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService { @Override public SuccessResultList> listPageProcdef(int page, int rows) { ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery(); - List processDefinitions = processDefinitionQuery.latestVersion().listPage(page - 1, rows); + List processDefinitions = processDefinitionQuery.latestVersion().listPage((page - 1) * rows, rows); List oaProcdefDTOs = listOaProcdef(processDefinitions); return new SuccessResultList<>(oaProcdefDTOs, page, processDefinitionQuery.count()); } @@ -181,7 +181,7 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService { @Override public SuccessResultList> listPageTaskByUserId(String userId, int page, int rows) { TaskQuery taskQuery = taskService.createTaskQuery().taskCandidateOrAssigned(userId); - List tasks = taskQuery.includeProcessVariables().orderByTaskCreateTime().desc().listPage(page - 1, rows); + List tasks = taskQuery.includeProcessVariables().orderByTaskCreateTime().desc().listPage((page - 1) * rows, rows); List oaTaskDTOs = listOaTask(tasks); return new SuccessResultList<>(oaTaskDTOs, page, taskQuery.count()); } @@ -272,7 +272,7 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService { @Override public SuccessResultList> listPageHistoryTaskByUserId(String userId, int page, int rows) { HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId); - List historicTaskInstances = historicTaskInstanceQuery.includeProcessVariables().finished().orderByHistoricTaskInstanceEndTime().desc().listPage(page - 1, rows); + List historicTaskInstances = historicTaskInstanceQuery.includeProcessVariables().finished().orderByHistoricTaskInstanceEndTime().desc().listPage((page - 1) * rows, rows); List oaHistoryTaskDTOs = listOaHistoryTask(historicTaskInstances); return new SuccessResultList<>(oaHistoryTaskDTOs, page, historicTaskInstanceQuery.count()); }