From bc0d3a878a16404f94e91bd3ba44e5ddf6e70d94 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 29 Sep 2022 14:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/service/impl/SearchCenterServiceImpl.java   | 10 ++++++----
 .../service/impl/StandLawsSearchServiceImpl.java       |  4 ++++
 2 files changed, 10 insertions(+), 4 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 aad97d2d..7afd8604 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
@@ -1495,14 +1495,16 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){
             if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){
                 queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(),
-                        "textContent"
-                ).minimumShouldMatch("100%").field("title",10f));
+                        "NYLXName"
+                ).minimumShouldMatch("100%"));
+//                        .field("title",10f));
             }
 
             if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){
                 queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(),
-                        "textContent"
-                ).minimumShouldMatch("100%").field("title",10f));
+                        "CLLXName"
+                ).minimumShouldMatch("100%"));
+//                        .field("title",10f));
             }
 
             boolQueryBuilder.must(queryBuilder);
diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
index d2539f51..ce74e0bb 100644
--- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
+++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java
@@ -466,6 +466,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
         }
         String title = String.valueOf(fullTextSearchEO.getOrDefault("title",""));
         fullTextSearchEO.put("titleBig",title.toUpperCase());
+        fullTextSearchEO.put("CLLXName",attrInfoMap.get("CLLXName"));
+        fullTextSearchEO.put("NYLXName",attrInfoMap.get("NYLXName"));
+        fullTextSearchEO.put("CLLX",attrInfoMap.get("CLLX"));
+        fullTextSearchEO.put("NYLX",attrInfoMap.get("NYLX"));
         return fullTextSearchEO;
     }