diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql index 2704d206..22d891b1 100644 --- a/db/update/测试阶段.sql +++ b/db/update/测试阶段.sql @@ -581,5 +581,11 @@ ALTER TABLE `laws_document_split` ALTER TABLE `laws_document_split` MODIFY COLUMN `enterprise_standard` longtext NULL COMMENT '企业标准'; - - +-- 20241010 添加修改清单版本按钮 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, +`menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, + `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, + `status`, `internal_or_external`, `menu_en`, `app_id`, `home_icon`) VALUES ('897f89d7927493820192749382b60000', + '897f89d79014d7fe019014d7fe2e0000', '修改清单版本', NULL, NULL, NULL, NULL, 2, 'marketStandard:editVersion', '1', + 9.00, 0, NULL, 1, 1, 0, 0, NULL, 'ldq', '2024-10-10 11:57:57', 'ldq', '2024-10-10 11:58:06', 0, 0, '1', 0, + 'Modify list version', NULL, NULL); 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 # 倾斜角度