lanyuanxiaoyao/spring-boot-service-template
1
0
Fork 0
Code Activity

fix: 修复查询排序没有应用

Browse Source
This commit is contained in:
兰缘小妖
2025-08-29 17:08:00 +08:00
parent 57c6e09fb0
commit 2232adc51c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java
View File

@@ -482,11 +482,18 @@ public abstract class SimpleServiceSupport<ENTITY extends SimpleEntity> implemen
public Page<ENTITY> list(Query listQuery) {
var pageRequest = PageRequest.of(DEFAULT_PAGE_INDEX - 1, DEFAULT_PAGE_SIZE, Sort.by(SimpleEntity.Fields.createdTime).descending());
if (ObjectHelper.isNotNull(listQuery.getPage())) {
pageRequest = PageRequest.of(
ObjectHelper.defaultIfNull(listQuery.getPage().getIndex(), DEFAULT_PAGE_INDEX) - 1,
ObjectHelper.defaultIfNull(listQuery.getPage().getSize(), DEFAULT_PAGE_SIZE),
Sort.by(SimpleEntity.Fields.createdTime).descending()
);
var index = Math.max(ObjectHelper.defaultIfNull(listQuery.getPage().getIndex(), DEFAULT_PAGE_INDEX) - 1, 0);
var size = Math.max(ObjectHelper.defaultIfNull(listQuery.getPage().getSize(), DEFAULT_PAGE_SIZE), 1);
if (ObjectHelper.isNotEmpty(listQuery.getSort())) {
pageRequest = PageRequest.of(index, size, Sort.by(
listQuery.getSort()
.stream()
.map(sort -> new Sort.Order(Sort.Direction.fromString(sort.getDirection().name()), sort.getColumn()))
.toList()
));
} else {
pageRequest = PageRequest.of(index, size);
}
}
return repository.findAll(
(root, query, builder) -> {