From 45fc7e9b5ee24af5f5e770011f54ad2a337ce125 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 28 Dec 2023 10:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DocumentSearchServiceImpl.java       | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 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 e924278ea..f44b2ab90 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
@@ -388,7 +388,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 String key = entry.getKey();
                 String value = (String) entry.getValue();
                 if(StringUtils.isNotBlank(value)){
-                    if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){
+                    if(("technology_territory".equals(key) || "standard_system".equals(key)) && ObjectUtils.isNotEmpty(value)){
                         JSONArray should = new JSONArray();
 
                         List<Map<String,Object>> mapList = new ArrayList<>();
@@ -401,31 +401,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                         }
                         JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should);
                         must.add(jsonObject);
-                    }else if("standard_system".equals(key) && ObjectUtils.isNotEmpty(value)){
-                        JSONArray should = new JSONArray();
-
-                        for (String s : value.split(",")) {
-                            Map<String,Object> map = new HashMap();
-                            map.put("query",s);
-                            Map<String,Object> map1 = new HashMap<>();
-                            map1.put(key,map);
-                            Map<String,Object> map2 = new HashMap<>();
-                            map2.put("match",map1);
-                            should.add(map2);
-                        }
-
-
-//                        for (String s : value.split(",")) {
-//                            Map<String,Object> map = new HashMap();
-//                            map.put(key,"*"+s+"*");
-//                            Map<String,Object> map1 = new HashMap<>();
-//                            map1.put("wildcard",map);
-//                            should.add(map1);
-//                        }
-
-                        JSONObject jsonObject = jeroElasticsearchTemplate.buildBoolQuery(null, null, should);
-                        must.add(jsonObject);
-                    }else{
+                    } else{
                         Map<String, Object> map = new HashMap<>();
                         Map<String, Object> queryMap = new HashMap<>();
                         Map<String, Object> queryMapTemp = new HashMap<>();