From ad741177e99a94adb679749a2ad17c9c3ddd00dc Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 17 Jun 2022 15:33:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=20=E4=B8=AD=E6=96=87=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=20=E4=B8=8A=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StandLawsSearchServiceImpl.java      | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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 5a102a9a..77620cf7 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
@@ -177,7 +177,11 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
         }
         if("stand".equals(attrInfoMap.get("type"))){
             // 标准全文
-            fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+"  "+attrInfoMap.getOrDefault("nameshow",""));
+            if(StringUtils.isNotBlank(attrInfoMap.getOrDefault("nameshow","").toString())){
+                fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+"  "+attrInfoMap.getOrDefault("nameshow",""));
+            }else{
+                fullTextSearchEO.put("title",attrInfoMap.get("numbershow")+"  "+attrInfoMap.getOrDefault("standEnName",""));
+            }
 
             for (String key : attrInfoMap.keySet()) {
                 if (null == attrInfoMap.get(key) || "".equals(attrInfoMap.get(key))){
@@ -301,7 +305,12 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                     attrInfoMap.put(key, "null");
                 }
             }
-            fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+"  "+attrInfoMap.getOrDefault("lawsNumber","")+"  "+attrInfoMap.getOrDefault("lawsName",""));
+            if(StringUtils.isNotBlank(attrInfoMap.getOrDefault("lawsName","").toString())){
+                fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+"  "+attrInfoMap.getOrDefault("lawsNumber","")+"  "+attrInfoMap.getOrDefault("lawsName",""));
+            }else{
+                fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+"  "+attrInfoMap.getOrDefault("lawsNumber","")+"  "+attrInfoMap.getOrDefault("lawsEnName",""));
+            }
+
             StringBuilder contentBuilder = new StringBuilder();
             contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append("  ");
             contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append("  ");
@@ -374,7 +383,11 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                     attrInfoMap.put(key, "null");
                 }
             }
-            fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+"  "+attrInfoMap.getOrDefault("stand_name",""));
+            if(StringUtils.isNotBlank(attrInfoMap.getOrDefault("stand_name","").toString())){
+                fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+"  "+attrInfoMap.getOrDefault("stand_name",""));
+            }else{
+                fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+"  "+attrInfoMap.getOrDefault("stand_en_name",""));
+            }
             StringBuilder contentBuilder = new StringBuilder();
             contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append("  ");
             contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append("  ");