Merge branch 'wangliwen'
This commit is contained in:
commit
0978d219df
|
@ -121,7 +121,7 @@ public class ActTaskService extends BaseServiceImpl {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
taskQuery.orderByTaskCreateTime().desc();
|
taskQuery.orderByTaskCreateTime().desc();
|
||||||
List<Task> list = taskQuery.listPage((curPage - 1) * limit, limit);
|
List<Task> list = taskQuery.active().listPage((curPage - 1) * limit, limit);
|
||||||
List<TaskDTO> listDto = new ArrayList<>();
|
List<TaskDTO> listDto = new ArrayList<>();
|
||||||
for (Task task : list) {
|
for (Task task : list) {
|
||||||
TaskDTO dto = new TaskDTO();
|
TaskDTO dto = new TaskDTO();
|
||||||
|
|
Loading…
Reference in New Issue