diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 002289a2..984c15c8 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -215,17 +215,17 @@ public class SearchCenterServiceImpl implements SearchCenterService { BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery(); updateIndex(searchInfoEO.getSelectIndex()); - String sortField = ""; - String sortField1 = ""; - String sortField2 = ""; +// String sortField = ""; +// String sortField1 = ""; +// String sortField2 = ""; String sortField3 = ""; if("laws".equals(searchInfoEO.getSelectIndex())){ - sortField1 = "lawsNumber"; - sortField2 = "lawsYear"; +// sortField1 = "lawsNumber"; +// sortField2 = "lawsYear"; sortField3 = "lawsType.keyword"; }else { - sortField1 = "standNumber"; - sortField2 = "standYear"; +// sortField1 = "standNumber"; +// sortField2 = "standYear"; sortField3 = "standSort.keyword"; } searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) @@ -233,8 +233,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) .addSort(new ScoreSortBuilder().order(SortOrder.DESC)) .addSort("standSortOrder", SortOrder.ASC) - .addSort(sortField1, SortOrder.ASC) - .addSort(sortField2, SortOrder.DESC) + .addSort("numberTitle", SortOrder.ASC) + .addSort("yearOrder", SortOrder.DESC) .addSort(sortField3, SortOrder.ASC) .addSort("issue_time_data", SortOrder.DESC) .setSize(searchInfoEO.getPageSize());