Merge pull request thinkgem#205 from tolower/patch-1

Update ActTaskService.java
xusir13 · Mar 23, 2016 · b110527 · b110527
2 parents 35cf230 + 1378ff3
commit b110527
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/thinkgem/jeesite/modules/act/service/ActTaskService.java b/src/main/java/com/thinkgem/jeesite/modules/act/service/ActTaskService.java
@@ -184,6 +184,8 @@ public Page<Act> historicList(Page<Act> page, Act act){
 
 		// 查询列表
 		List<HistoricTaskInstance> histList = histTaskQuery.listPage(page.getFirstResult(), page.getMaxResults());
+		//处理分页问题
+		List<Act> actList=Lists.newArrayList();
 		for (HistoricTaskInstance histTask : histList) {
 			Act e = new Act();
 			e.setHistTask(histTask);
@@ -194,8 +196,10 @@ public Page<Act> historicList(Page<Act> page, Act act){
 //			e.setProcIns(runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult());
 //			e.setProcExecUrl(ActUtils.getProcExeUrl(task.getProcessDefinitionId()));
 			e.setStatus("finish");
-			page.getList().add(e);
+			actList.add(e);
+			//page.getList().add(e);
 		}
+		page.setList(actList);
 		return page;
 	}