From a56244fca8ca80427ef1218123a8083610cbe3ce Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 25 Aug 2022 10:12:54 +0800
Subject: [PATCH] =?UTF-8?q?58582=20=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93-=E9=97=AE=E9=A2=98=E5=88=86=E7=B1=BB=E3=80=81?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=A4=9A=E9=80=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProblemKnowledgeBaseEOServiceImpl.java   | 10 +++++-----
 .../service/impl/DocumentSearchServiceImpl.java   | 15 +++++++++------
 2 files changed, 14 insertions(+), 11 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 e1e298f70..087d3aabf 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
@@ -92,7 +92,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
         	//如果展示权限是公开，则把该数据插入到搜索中心中。
 			this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
 		}
-//		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -403,7 +403,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			//this.deleteElasticsearchData(problemKnowledgeBaseEO.getId());
 		}
 
-//		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
+		this.addOrUpdateElasticsearch(problemKnowledgeBaseEO);
     }
 
 	/**
@@ -439,9 +439,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
         this.problemKnowledgeBaseCommentEOService.remove(deleteWrapper);
 
-//		for (String problemKnowledgeBaseId : ids) {
-//			this.deleteElasticsearchData(problemKnowledgeBaseId);
-//		}
+		for (String problemKnowledgeBaseId : ids) {
+			this.deleteElasticsearchData(problemKnowledgeBaseId);
+		}
     }
 
 	/**
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 bfa4c7e6f..73e1c1aa0 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
@@ -41,10 +41,7 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -1186,9 +1183,15 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
             mapHighlight1.put("fields",mapHighlight);
         }
 
-        //封装问题类型选择框查询条件。
+        //封装问题类型选择框查询条件(类似于in条件)。
         if (StringUtils.isNotBlank(problem_type)) {
-            this.createQueryWhere(problem_type,"problem_type",queryMapJson,SearchEnum.INDEX_PROBLEM_KNOWLEDGE_BASE.getValue());
+            List<String> problemTypeList = Arrays.asList(problem_type.split(","));
+
+            Map<String, Object> problemTypeKeyMap = new HashMap<>();
+            Map<String, Object> problemTypeMatchMap = new HashMap<>();
+            problemTypeKeyMap.put("problem_type", problemTypeList);
+            problemTypeMatchMap.put("terms",problemTypeKeyMap);
+            queryMapJson.add(problemTypeMatchMap);
         }
 
         //封装市场选择框查询条件。