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", ">") - .replace("<sub>", "").replace("</sub>", "") - .replace("<sup>", "").replace("</sup>", ""); - String translation = valEO.getTranslation().replace("<", "<").replace(">", ">") - .replace("<sub>", "").replace("</sub>", "") - .replace("<sup>", "").replace("</sup>", ""); + String itemContent = valEO.getItemContent(); + String translation = valEO.getTranslation(); // 当前段内容 String valContent = ""; String valContentTranslation = ""; if ("TEXT".equals(type)) { + itemContent = itemContent.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", ""); valContent += "

" + itemContent + "

"; if (StringUtils.isNotBlank(translation)){ + translation = translation.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", ""); valContentTranslation += "

" + translation + "

"; } } else if ("IMG".equals(type)) { @@ -3563,9 +3565,26 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl"; } } else if ("TABLE".equals(type)) { + itemContent = itemContent.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", "") + .replace("<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">", "") + .replace("</table>", "
") + .replace("<tr>", "").replace("</tr>", "") + .replace("<td >", "").replace("</td>", "") + ; + valEO.setItemContent(itemContent.replaceAll("\n","
")); valContent += itemContent; if (StringUtils.isNotBlank(translation)){ + translation = translation.replace("<", "<").replace(">", ">") + .replace("<sub>", "").replace("</sub>", "") + .replace("<sup>", "").replace("</sup>", "") + .replace("<table border=\"1\" style=\"border-collapse:collapse;width:100%;\">", "") + .replace("</table>", "
") + .replace("<tr>", "").replace("</tr>", "") + .replace("<td >", "").replace("</td>", "") + ; valEO.setTranslation(translation.replaceAll("\n","
")); 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(" "); + sb.append(" "); continue; }else if(row.getZeroHeight()){ continue;