diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 6f0b81ed..1d1c2581 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -385,7 +385,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { // 企标权限校验 enterpriseCheck(sarFileSplitInfoEO); // 唯一校验 -// uniqueCheck(sarFileSplitInfoEO); + uniqueCheck(sarFileSplitInfoEO); // 保存文本拆分数据 saveDocumentSplitInfo(sarFileSplitInfoEO); //拆分 diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 1b3016e4..960f3bd1 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -251,10 +251,12 @@ public class FileSpiltService { for (XWPFRun xwrun : p.getRuns()) { VerticalAlign subscript = xwrun.getSubscript(); String smalltext = xwrun.getText(0); + if (StringUtils.isNotBlank(smalltext)){ + smalltext = smalltext.replace("<", "<").replace(">", ">"); + } if (smalltext==null){ continue; } - smalltext = smalltext.replaceAll("<", "<").replaceAll(">", ">"); switch (subscript) { case BASELINE: stringBuilder.append(smalltext); @@ -1041,9 +1043,6 @@ public class FileSpiltService { // 像每个条款中依次插入每一段的内容 public static void addItermsConditionsText(SarFileSplitItemsEO message, List itemsValList, String p, ParagraphAlignment alignment) { - if (StringUtils.isNotBlank(p)){ - //p = p.replace("<", "<").replace(">", ">"); - } message.getItemsCondi().add(p); if (ParagraphAlignment.CENTER.equals(alignment)){ message.setItemContent(message.getItemContent() + "

" + p + "

");