From a905e773fc26065ac881ae5c7f9ead95a0c1d3b7 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 24 Aug 2022 17:05:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83-=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=9C=88=E6=8A=A5-bug58586?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMonthlyReportManageEOServiceImpl.java  | 6 +++---
 .../service/impl/LawsMonthlyReportSearchServiceImpl.java    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
index c9f25752b..c96a1553d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
@@ -163,7 +163,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 					|| ossFile.getFileName().endsWith(".DOC")
 					|| ossFile.getFileName().endsWith(".DOCX")) {
 
-				String wordContent = null;
+				String wordContent = "--"; // 默认文件内容为空 ，不能定义为null,前端会加载不出页面
 				try {
 					wordContent = ReadWordUtil.readWord(ossFile.getUrl(),uploadpath);
 				} catch (Exception e) {
@@ -173,7 +173,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 					fileText = wordContent;
 				}
 			} else if (ossFile.getFileName().endsWith(".pdf") || ossFile.getFileName().endsWith(".PDF")) {
-				String pdfContent = null;
+				String pdfContent = "--"; // 默认文件内容为空 ，不能定义为null,前端会加载不出页面
 				try {
 					pdfContent = ReadPdfUtil.readPdf(ossFile.getUrl());
 				} catch (Exception e) {
@@ -259,7 +259,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 		stringMap.put("file_text", fileText);
 		stringMap.put("file_name", fileName);
 		stringMap.put("file_id", fileId);
-		stringMap.put("issue_time", issueTime);
+		stringMap.put("create_time", issueTime);
 		stringMap.put("cut",cut);
 		stringMap.put("flag",flag);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
index 54c828580..f046e4f02 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
@@ -166,7 +166,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
         Map<String,Object> issueTime = new HashMap<>();
         Map<String,Object> issueTime1 = new HashMap<>();
         issueTime.put("order","desc");
-        issueTime1.put("issue_time",issueTime);
+        issueTime1.put("create_time",issueTime);
         sort.putAll(issueTime1);
 
 //        Map<String,Object> mapSort = new HashMap<>();
@@ -258,7 +258,7 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
         list1.add("</text>");
         mapTemp.put("pre_tags", list);
         mapTemp.put("post_tags", list1);
-        mapTemp.put("fragment_size", 200);//高亮字段内容长度，去除html样式标签，统计字数，设置为200
+        mapTemp.put("fragment_size", 550);//高亮字段内容长度，去除html样式标签，统计字数，设置为200
         mapTemp.put("number_of_fragments", 1);//高亮内容默认分为5段, 此处设置为一段
         mapTemp.put("type", "plain");
         mapHighlight.put(key, mapTemp);