| @@ -184,7 +184,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| } | } | ||||
| List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(flowKey) | List<Task> tasks = taskService.createTaskQuery().processDefinitionKey(flowKey) | ||||
| .taskCandidateUser(userId.toString()).orderByTaskCreateTime().desc().listPage((pageNum -1) * pageSize,pageSize); | |||||
| .taskCandidateUser(userId.toString()).orderByTaskCreateTime().desc() | |||||
| .listPage((pageNum -1) * pageSize,pageSize); | |||||
| List<Map<String,Object>> result = new ArrayList<>(); | List<Map<String,Object>> result = new ArrayList<>(); | ||||
| for (Task task : tasks) { | for (Task task : tasks) { | ||||
| @@ -208,26 +209,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| PageHelper.startPage(pageNum, pageSize); | PageHelper.startPage(pageNum, pageSize); | ||||
| PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result); | PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result); | ||||
| pageInfo.setPages(pages); | pageInfo.setPages(pages); | ||||
| if(pageNum < pages){ | |||||
| pageInfo.setHasNextPage(true); | |||||
| pageInfo.setNextPage(pageNum +1); | |||||
| }else{ | |||||
| pageInfo.setHasNextPage(false); | |||||
| } | |||||
| if(pageNum <= 1){ | |||||
| pageInfo.setHasPreviousPage(false); | |||||
| pageInfo.setPrePage(0); | |||||
| pageInfo.setIsFirstPage(true); | |||||
| }else{ | |||||
| pageInfo.setHasNextPage(true); | |||||
| pageInfo.setIsFirstPage(false); | |||||
| } | |||||
| if(pageNum == pages){ | |||||
| pageInfo.setNextPage(0); | |||||
| pageInfo.setIsLastPage(true); | |||||
| }else{ | |||||
| pageInfo.setIsLastPage(false); | |||||
| } | |||||
| pageInfo.setTotal(total); | |||||
| return new ResultData(pageInfo); | return new ResultData(pageInfo); | ||||
| } | } | ||||