From 9b1b2671db1a5076775ee29c6acc3b4f336231bc Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 7 Apr 2022 22:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?,=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java  | 17 +++++++++++++++++
 .../service/impl/DocumentSearchServiceImpl.java |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index aceaee1c1..1345168cb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1269,6 +1269,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         objectMap.put("file_sort",idTemp+"_"+b);
                     }
                 }
+                for (OnlCgformField onlCgformField : searchFieldList) {
+                    String s = (String) map.get(onlCgformField.getDbFieldName());
+                    if(StringUtils.isNotBlank(s)){
+                        mapBaseDateCn.put(onlCgformField.getDbFieldName(), s);
+                        mapBaseDateEn.put(onlCgformField.getDbFieldName(), s);
+                    }
+                }
                 //基础数据(中文)
                 putMapCn(idTemp, (String) map.get("serial_number"), "文档库",
                         sbCn.toString(), (String) map.get("title"), "", "",
@@ -1935,6 +1942,16 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             }
         }
 
+        for (OnlCgformField onlCgformField : searchFieldList) {
+            String s = (String) map.get(onlCgformField.getDbFieldName());
+            if(FieldTypeEnum.DATE_SINGLE.getValue().equals(onlCgformField.getFieldShowType()) && StringUtils.isNotBlank(s)){
+                s = s.split(" ")[0];
+            }
+            if(StringUtils.isNotBlank(s)){
+                mapBaseDateCn.put(onlCgformField.getDbFieldName(), s);
+                mapBaseDateEn.put(onlCgformField.getDbFieldName(), s);
+            }
+        }
         //基础数据中文(es)
         putMapCn((String) map.get("id"), (String) map.get("serial_number"), "文档库",
                 sbCn.toString(), (String) map.get("title"), "", "",
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 20444c590..6fb0cdc1c 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
@@ -482,6 +482,9 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
 
         for (Map<String, Object> stringObjectMap : list) {
             Map<String, Object> mapSource = (Map<String, Object>) stringObjectMap.get("_source");
+            if(StringUtils.isBlank(selectValue)){
+                mapSource.put("file_text","");
+            }
             if (StringUtils.isNotBlank(selectValueTwo)) {
                 //二次查询
                 int count = 0;