From 7f36f4899e9420dc831a448e37e8f51dbe9e1673 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 17 Jun 2022 15:54:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20=E8=B0=83=E6=95=B4ES=20=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E8=A7=84=E5=88=99=20=E6=9B=B4=E6=96=B0=20es=20?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SearchCenterServiceImpl.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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());