From 8f625c60a79fd888b1a5c9fcb98b8170ac462c90 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 19 Aug 2024 09:52:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(88835):=20=E6=A0=87=E5=87=86=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9--=E5=AF=B9=E6=AF=94=E7=BB=93=E6=9E=9C--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=BB=93=E6=9E=9C=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
index a2fd116c..b572b0eb 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.MessageUtils;
+import com.jero.common.util.SnowflakeUtils;
 import com.jero.common.util.obs.ObsBootUtil;
 import com.jero.modules.compare.entity.*;
 import com.jero.modules.compare.enums.AssessConsistencyEnum;
@@ -686,7 +687,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
         }
         String cnt = "\n";
         tableHtml = tableHtml.replaceAll("<[\\s]*?br[^>]*?>|<[\\s]*?\\/[\\s]*?br[\\s]*?>", cnt);
-        String tableSheetName = "表格" + System.currentTimeMillis();
+        String tableSheetName = "表格" + SnowflakeUtils.snowflake();
         ConvertHtml2Excel.table2Excel(tableHtml, (HSSFWorkbook) workbook, tableSheetName);
         log.info("-------------------------表格生产完毕----------------------------");
         //添加超链接
@@ -749,6 +750,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
         if (text.contains("<img")) {
             String txtLeft = text.substring(0, text.indexOf("<img"));
             String txtRight = text.substring(text.indexOf("g\">") + 3);
+            if (text.indexOf("<img") == -1 || text.indexOf("g\">") == -1){
+                return;
+            }
             String img = text.substring(text.indexOf("<img"), text.indexOf("g\">"));
             String path = img.substring(img.lastIndexOf("=") + 1)+"g";
             text = txtLeft + "---" + path + "---" + txtRight;