Skip to content

fix: process orderByParams before baseSortParams to preserve sort order for _score and custom fields #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zh-hanlabs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: process orderByParams before baseSortParams to preserve sort order for _score and custom fields #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions easy-es-core/src/main/java/org/dromara/easyes/core/kernel/WrapperProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,17 +805,6 @@ private static Highlight.Builder initHighlightBuilder(List<HighLightParam> highL
* @param searchBuilder 查询参数建造者
*/
private static void setSort(Wrapper<?> wrapper, Map<String, String> mappingColumnMap, EntityInfo entityInfo, SearchRequest.Builder searchBuilder) {
// 批量设置排序字段
if (CollectionUtils.isNotEmpty(wrapper.baseSortParams)) {
wrapper.baseSortParams.forEach(baseSortParam -> {
// 获取es中的实际字段 有可能已经被用户自定义或者驼峰转成下划线
String realField = Objects.isNull(baseSortParam.getSortField()) ?
null : getRealFieldAndSuffix(baseSortParam.getSortField(), mappingColumnMap, entityInfo);
SortOptions sortBuilder = getSortBuilder(realField, baseSortParam);
Optional.ofNullable(sortBuilder).ifPresent(searchBuilder::sort);
});
}

// 设置以String形式指定的自定义排序字段及规则(此类排序通常由前端传入,满足部分用户个性化需求)
if (CollectionUtils.isNotEmpty(wrapper.orderByParams)) {
wrapper.orderByParams.forEach(orderByParam -> {
Expand All @@ -842,6 +831,17 @@ private static void setSort(Wrapper<?> wrapper, Map<String, String> mappingColum
searchBuilder.sort(x -> x.field(fieldSortBuilder.build()));
});
}
// 批量设置排序字段
if (CollectionUtils.isNotEmpty(wrapper.baseSortParams)) {
wrapper.baseSortParams.forEach(baseSortParam -> {
// 获取es中的实际字段 有可能已经被用户自定义或者驼峰转成下划线
String realField = Objects.isNull(baseSortParam.getSortField()) ?
null : getRealFieldAndSuffix(baseSortParam.getSortField(), mappingColumnMap, entityInfo);
SortOptions sortBuilder = getSortBuilder(realField, baseSortParam);
Optional.ofNullable(sortBuilder).ifPresent(searchBuilder::sort);
});
}

}


Expand Down