From 28512e6e788d3ca621ff06acde201646119e1f83 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 15 Aug 2024 14:33:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9D=A1=E6=AC=BE=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index de5c50a4..c9d3ac16 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -4379,6 +4379,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 String content = exportDto.get(fieldName).toString();
                                 if (StringUtils.isNotEmpty(content)) {
                                     content = content.replaceAll("null","");
+                                    content = content.replaceAll("<p>","");
+                                    content = content.replaceAll("</p>","\n");
                                     if (content.lastIndexOf("\n") > -1) {
                                         content = content.substring(0,content.lastIndexOf("\n"));
                                     }
@@ -4509,16 +4511,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
                     workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName);
 
-                    if (StringUtils.isNotEmpty(tableHtmlTranslation) && tableHtmlTranslation.indexOf("<tbody>") < 0) {
-                        if (tableHtmlTranslation.indexOf("<thead>") < 0) {
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("<tr>","<tbody><tr>");
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</table>","</tbody></table>");
-                        } else {
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</thead>","</thead><tbody>");
-                            tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</table>","</tbody></table>");
+                    if (StringUtils.isNotEmpty(tableHtmlTranslation)) {
+                        if (!tableHtmlTranslation.contains("<tbody>")){
+                            if (!tableHtmlTranslation.contains("<thead>")) {
+                                tableHtmlTranslation = tableHtmlTranslation.replaceFirst("<tr>","<tbody><tr>");
+                                tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</table>","</tbody></table>");
+                            } else {
+                                tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</thead>","</thead><tbody>");
+                                tableHtmlTranslation = tableHtmlTranslation.replaceFirst("</table>","</tbody></table>");
+                            }
                         }
+                        tableHtmlTranslation = tableHtmlTranslation.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
                     }
-                    tableHtmlTranslation = tableHtmlTranslation.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
                     workbook = ConvertHtml2Excel.table2Excel(tableHtmlTranslation,workbook,tableName+"translation");
 //                    for (int r=0;r<rowtableList.size();r++) {
 //                        List<SarFileSplitItemsTableEO> colTableList = rowtableList.get(r);