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","");
+ content = content.replaceAll("
","\n");
if (content.lastIndexOf("\n") > -1) {
content = content.substring(0,content.lastIndexOf("\n"));
}
@@ -4509,16 +4511,18 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
workbook = ConvertHtml2Excel.table2Excel(tableHtml,workbook,tableName);
- if (StringUtils.isNotEmpty(tableHtmlTranslation) && tableHtmlTranslation.indexOf("") < 0) {
- if (tableHtmlTranslation.indexOf("") < 0) {
- tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","
");
- tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","
");
- } else {
- tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","");
- tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","");
+ if (StringUtils.isNotEmpty(tableHtmlTranslation)) {
+ if (!tableHtmlTranslation.contains("")){
+ if (!tableHtmlTranslation.contains("")) {
+ tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","
");
+ tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","
");
+ } else {
+ tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","");
+ tableHtmlTranslation = tableHtmlTranslation.replaceFirst("","");
+ }
}
+ 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 colTableList = rowtableList.get(r);