From 678ceb30aa05b488a16dfe6c315104fcaf94eddb Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 6 Aug 2024 12:24:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(88145):=20=E6=A0=87=E5=87=86=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9--=E5=8F=91=E8=B5=B7=E5=AF=B9=E6=AF=94=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compare/service/impl/SarFileCompareInfoServiceImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
index a2982042..db9774c1 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
@@ -26,6 +26,7 @@ import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
 import com.jero.modules.system.util.MyStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -186,8 +187,8 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
                         if (null != rightAllTxt && !rightAllTxt.isEmpty()) {
                             double similarity = 0;
                             // 使用正则表达式判断是否是纯<img>标签，不以</p>结尾，也不以</table>结尾
-                            String leftTxtTrim = leftTxt.trim();
-                            String rightTxtTrim = rightTxt.trim();
+                            String leftTxtTrim = StringUtils.isBlank(leftTxt) ? "" : leftTxt.trim();
+                            String rightTxtTrim = StringUtils.isBlank(rightTxt) ? "" : rightTxt.trim();
                             boolean leftTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", leftTxtTrim);
                             boolean rightTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", rightTxtTrim);
                             if (leftTxtMatches && rightTxtMatches){