From e9658e4db5f618ce31b3640291818f42259c5bc7 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 28 Mar 2024 14:07:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=86=E5=88=86=E4=B8=8A=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=92=E6=A0=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DocumentSplitServiceImpl.java             | 2 +-
 .../jero/modules/split/service/impl/FileSpiltService.java  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

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("<", "&lt;").replace(">", "&gt;");
+                        }
                         if (smalltext==null){
                             continue;
                         }
-                        smalltext = smalltext.replaceAll("<", "&lt;").replaceAll(">", "&gt;");
                         switch (subscript) {
                             case BASELINE:
                                 stringBuilder.append(smalltext);
@@ -1041,9 +1043,6 @@ public class FileSpiltService {
 
     // 像每个条款中依次插入每一段的内容
     public static void addItermsConditionsText(SarFileSplitItemsEO message, List<SarFileSplitItemsValEO> itemsValList, String p, ParagraphAlignment alignment) {
-        if (StringUtils.isNotBlank(p)){
-            //p = p.replace("<", "&lt;").replace(">", "&gt;");
-        }
         message.getItemsCondi().add(p);
         if (ParagraphAlignment.CENTER.equals(alignment)){
             message.setItemContent(message.getItemContent() + "<p style=\"text-align: center;\">" + p + "</p>");