From 6429834ed6202fbc0c34bbd95ba2344a78b8597e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 12 Oct 2024 09:41:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9D=A1=E6=AC=BE=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6<>=E8=BD=AC=E4=B8=BA&lt;&gt;?=
 =?UTF-8?q?=E6=97=B6=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=92=E6=A0=87=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 31 +++++++++++++++----
 .../split/util/POIReadExcelToHtml.java        |  2 +-
 2 files changed, 26 insertions(+), 7 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 9910c1f1..734a4fa7 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
@@ -3543,18 +3543,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         if (getValList != null && !getValList.isEmpty()) {
             for (SarFileSplitItemsValEO valEO : getValList) {
                 String type = valEO.getType();
-                String itemContent = valEO.getItemContent().replace("<", "&lt;").replace(">", "&gt;")
-                        .replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
-                        .replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>");
-                String translation = valEO.getTranslation().replace("<", "&lt;").replace(">", "&gt;")
-                        .replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
-                        .replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>");
+                String itemContent = valEO.getItemContent();
+                String translation = valEO.getTranslation();
                 // 当前段内容
                 String valContent = "";
                 String valContentTranslation = "";
                 if ("TEXT".equals(type)) {
+                    itemContent = itemContent.replace("<", "&lt;").replace(">", "&gt;")
+                            .replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
+                            .replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>");
                     valContent += "<p>" + itemContent + "</p>";
                     if (StringUtils.isNotBlank(translation)){
+                        translation = translation.replace("<", "&lt;").replace(">", "&gt;")
+                                .replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
+                                .replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>");
                         valContentTranslation += "<p>" + translation + "</p>";
                     }
                 } else if ("IMG".equals(type)) {
@@ -3563,9 +3565,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         valContentTranslation += "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ translation +"\">";
                     }
                 } else if ("TABLE".equals(type)) {
+                    itemContent = itemContent.replace("<", "&lt;").replace(">", "&gt;")
+                            .replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
+                            .replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>")
+                            .replace("&lt;table border=\"1\" style=\"border-collapse:collapse;width:100%;\"&gt;", "<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">")
+                            .replace("&lt;/table&gt;", "</table>")
+                            .replace("&lt;tr&gt;", "<tr>").replace("&lt;/tr&gt;", "</tr>")
+                            .replace("&lt;td &gt;", "<td>").replace("&lt;/td&gt;", "</td>")
+                    ;
+
                     valEO.setItemContent(itemContent.replaceAll("\n","<br/>"));
                     valContent += itemContent;
                     if (StringUtils.isNotBlank(translation)){
+                        translation = translation.replace("<", "&lt;").replace(">", "&gt;")
+                                .replace("&lt;sub&gt;", "<sub>").replace("&lt;/sub&gt;", "</sub>")
+                                .replace("&lt;sup&gt;", "<sup>").replace("&lt;/sup&gt;", "</sup>")
+                                .replace("&lt;table border=\"1\" style=\"border-collapse:collapse;width:100%;\"&gt;", "<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">")
+                                .replace("&lt;/table&gt;", "</table>")
+                                .replace("&lt;tr&gt;", "<tr>").replace("&lt;/tr&gt;", "</tr>")
+                                .replace("&lt;td &gt;", "<td>").replace("&lt;/td&gt;", "</td>")
+                        ;
                         valEO.setTranslation(translation.replaceAll("\n","<br/>"));
                         valContentTranslation += translation;
                     }
diff --git a/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java b/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java
index b12d42df..09c31f16 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/util/POIReadExcelToHtml.java
@@ -107,7 +107,7 @@ public class POIReadExcelToHtml {
             }
 
             if (null == row) {
-                sb.append("<tr><td >  </td></tr>");
+                sb.append("<tr><td>  </td></tr>");
                 continue;
             }else if(row.getZeroHeight()){
                 continue;