From f6f6146c838cf629299b291e424d89ce397dc938 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Tue, 13 Jun 2023 11:02:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarFileSplitInfoEOServiceImpl.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
index fd3c534c..a6783d83 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
@@ -595,7 +595,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
         }
         String text = buffer.toString();
         if (length > 0) {
-            text = text.substring(length);
+            try {
+                text = text.substring(length);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
         message.getItemsCondi().add(text);
         message.setItermsConditions(message.getItermsConditions() + "<p>" + text + "<p>");

From aab7a0fb4a7c44ed944ed1d8fd182856891f0e5a Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Tue, 13 Jun 2023 14:15:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E5=AE=9A=E9=A1=BA=E5=BA=8F=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarBussionessStandServiceImpl.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 81297190..7b5498fb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -273,7 +273,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
             if(ObjectUtils.isNotEmpty(bussionessStand)){
                 sn = bussionessStand.getNewStandSn();
             }
-            if (StringUtils.isBlank(MaxSn) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
+            if ((StringUtils.isBlank(MaxSn) || !MaxSn.equals(standMaxSn)) && (StringUtils.isBlank(snStandSort) || snStandSort.equals(standSort))){
                 saveBussStandSn(reviseStatus, standSort, sn, taskId);
             }
             bussionessStand.setStandSn(sn);

From 444f8e1345df6463a3a225b8cf466d6cb2912061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 13 Jun 2023 20:12:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarFileSplitInfoEOServiceImpl.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
index a6783d83..ffd826ef 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
@@ -214,7 +214,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
                     paragraphString = paragraphString.replaceAll("\r\n","");
                     paragraphString = paragraphString.replaceAll("\n","");
                     paragraphString = paragraphString.trim();
-                    if ("前言".equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
+                    if (getChinese("前言").equals(getChinese(paragraphString)) && (paragraphString.replaceAll("\t", "")
                             .replaceAll("\b", "").replaceAll(" ", "").length() == 2)) { // 前言后面有文本，判定为是目录中的前言
                         firstFlag = false;
                     }