From 1d214373a02a3dc69b7549e0628209b7db3e0c6d Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 26 Aug 2022 13:40:59 +0800
Subject: [PATCH] =?UTF-8?q?58572=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=B8=AD=E5=BF=83=E6=8E=92=E5=BA=8F=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java   | 8 ++++----
 .../service/impl/DocumentSearchServiceImpl.java           | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 087d3aabf..ef7d1f457 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -222,7 +222,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 	public void esFullText(ProblemKnowledgeBaseEO problemKnowledgeBaseEO,StringBuilder sbCn,StringBuilder sbEn,String cut,String fileText,List<DictModel> targetMarketList){
 		if(StringUtils.equals(cut,CutEnum.CN.getValue())){
-			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
+			/*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
 				String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut);
 				sbCn.append("展示权限" + ":" + textByValue + " ");
 			}else {
@@ -233,7 +233,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				sbCn.append("标题" + ":" + problemKnowledgeBaseEO.getTitle() + " ");
 			}else {
 				sbCn.append("标题" + ":" + "-- ");
-			}
+			}*/
 
 			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){
 				sbCn.append("问题分类" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " ");
@@ -285,7 +285,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			}
 		}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
 
-			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
+			/*if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getShowPermissions())){
 				String textByValue = ShowPermissionsEnum.getTextByValue(problemKnowledgeBaseEO.getShowPermissions(), cut);
 				sbEn.append("Display permission" + ":" + textByValue + " ");
 			}else {
@@ -296,7 +296,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				sbEn.append("Title" + ":" + problemKnowledgeBaseEO.getTitle() + " ");
 			}else {
 				sbEn.append("Title" + ":" + "-- ");
-			}
+			}*/
 
 			if(StringUtils.isNotEmpty(problemKnowledgeBaseEO.getProblemTypeName())){
 				sbEn.append("Problem classification" + ":" + problemKnowledgeBaseEO.getProblemTypeName() + " ");
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 841648c5c..284ad5277 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
@@ -33,6 +33,7 @@ import com.jero.modules.system.entity.SysCategory;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +50,7 @@ import java.util.stream.Collectors;
  * @date 2022/3/14 10:03
  * @auth zhn
  */
+@Slf4j
 @Component
 public class DocumentSearchServiceImpl implements IDocumentSearchService {
     @Autowired
@@ -546,7 +548,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
         }
 
         JSONObject sort = new JSONObject();
-        if(StringUtils.isEmpty(selectValue)){
+        if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){
             Map<String,Object> createTime = new HashMap<>();
             Map<String,Object> createTime1 = new HashMap<>();
             createTime.put("order","desc");
@@ -559,6 +561,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             score1.put("_score",score);
             sort.putAll(score1);
         }
+        log.info("搜索中心-全部索引，排序方式为：" + sort.toJSONString());
 
 //        Map<String,Object> mapSort = new HashMap<>();
 //        Map<String,Object> mapSortTemp = new HashMap<>();
@@ -1256,7 +1259,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             queryMapJsonAll.add(jsonObjectThree);
         }
         JSONObject sort = new JSONObject();
-        if(StringUtils.isEmpty(selectValue)){
+        if(StringUtils.isEmpty(selectValue) || StringUtils.equals(selectValue,SEARCH_FLAG)){
             Map<String,Object> createTime = new HashMap<>();
             Map<String,Object> createTime1 = new HashMap<>();
             createTime.put("order","desc");