From 8e98b64e480c7922e27787c8376e5614513e9561 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 25 Aug 2022 15:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93=20=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DocumentSearchServiceImpl.java       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index 73e1c1aa0..841648c5c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -544,20 +544,21 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             JSONObject jsonObjectThree = jeroElasticsearchTemplate.buildBoolQuery(null, null, queryMapJsonThree);
             queryMapJsonAll.add(jsonObjectThree);
         }
+
         JSONObject sort = new JSONObject();
-        Map<String,Object> score = new HashMap<>();
-        Map<String,Object> score1 = new HashMap<>();
-        score.put("order","desc");
-        score1.put("_score",score);
-        sort.putAll(score1);
-        /*JSONObject sort = new JSONObject();
         if(StringUtils.isEmpty(selectValue)){
             Map<String,Object> createTime = new HashMap<>();
             Map<String,Object> createTime1 = new HashMap<>();
             createTime.put("order","desc");
             createTime1.put("create_time",createTime);
             sort.putAll(createTime1);
-        }*/
+        }else {
+            Map<String,Object> score = new HashMap<>();
+            Map<String,Object> score1 = new HashMap<>();
+            score.put("order","desc");
+            score1.put("_score",score);
+            sort.putAll(score1);
+        }
 
 //        Map<String,Object> mapSort = new HashMap<>();
 //        Map<String,Object> mapSortTemp = new HashMap<>();
@@ -1261,6 +1262,12 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             createTime.put("order","desc");
             createTime1.put("create_time",createTime);
             sort.putAll(createTime1);
+        }else {
+            Map<String,Object> score = new HashMap<>();
+            Map<String,Object> score1 = new HashMap<>();
+            score.put("order","desc");
+            score1.put("_score",score);
+            sort.putAll(score1);
         }
 
         Integer pageNo = Integer.parseInt(map.get("pageNo").toString());