Merge remote-tracking branch 'origin/master'

This commit is contained in:
zjh 2025-12-22 16:27:17 +08:00
commit 2b0312b6bc

View File

@ -74,6 +74,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
PageResultDTO<TodoTaskPojo> todoTaskPojoPageResultDTO = new PageResultDTO<>();
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("created_by_id", todoTaskRequest.getCreatedById())
.orderBy("last_update_date","desc")
.doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
todoTaskPojoPageResultDTO.setList(queryResult.getResult());
todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount());
@ -121,6 +122,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("owner_id", todoTaskRequest.getPersonId())
.eq("is_delete", dOrYTask)
.orderBy("last_update_date","desc")
.doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
List<TodoTaskPojo> todoTaskPojos = queryResult.getResult();
pageResultDTO.setList(todoTaskPojos);