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 838544e0..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 @@ -3549,8 +3549,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl", ">") + .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)) { @@ -3559,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; } @@ -3598,7 +3621,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl", ">"); if (StringUtils.isBlank(str)) { map.put(key,value); }else { 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; diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml index 650f428e..1322648d 100644 --- a/laws-single-startup/src/main/resources/application-dev-chery.yml +++ b/laws-single-startup/src/main/resources/application-dev-chery.yml @@ -485,7 +485,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度 diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index 2ca34c8d..7ea4ff97 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -480,7 +480,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度 diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml index 668b4063..71fca51a 100644 --- a/laws-single-startup/src/main/resources/application-prod.yml +++ b/laws-single-startup/src/main/resources/application-prod.yml @@ -486,7 +486,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度 diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index b26f1285..9c4e989b 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -485,7 +485,7 @@ download: watermark: font-size: 13.0 # 每页几行 - lineNumPerPage: 8 + lineNumPerPage: 4 # 每页几列 columnNumPerPage: 3 # 倾斜角度