From 6620c0cbac7ca7c341cbcaf69ca65f1e63b7d95a Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 5 Aug 2024 17:09:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA?=
 =?UTF-8?q?=E5=88=86=E6=89=B9=E4=B8=8B=E5=8F=91=E5=AF=BC=E5=87=BABUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckServiceImpl.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
index 548a0b17..c62b09ee 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
@@ -502,7 +502,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.HSSF);
             // 去除文本的<p>
-            detailInfoList.forEach(detail -> detail.setTermContent(detail.getTermContent().replaceAll("<p>", "")));
+            detailInfoList.forEach(detail -> {
+                if (StrUtil.isNotBlank(detail.getTermContent())) {
+                    detail.setTermContent(detail.getTermContent().replaceAll("<p>", ""));
+                }
+            });
             // 复制一份数据
             List<ProcessStandardComplianceCheckDetail> newRecordsExport = new ArrayList<>(detailInfoList);
             Workbook workbook = ExcelExportUtil
@@ -546,7 +550,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
                     ProcessStandardComplianceCheckDetail::setFileList);
 
             // 去除文本的<p>
-            detailInfoList.forEach(detail -> detail.setTermContent(detail.getTermContent().replaceAll("<p>", "")));
+            detailInfoList.forEach(detail -> {
+                if (StrUtil.isNotBlank(detail.getTermContent())) {
+                    detail.setTermContent(detail.getTermContent().replaceAll("<p>", ""));
+                }
+            });
 
             // 生成excel
             ExportParams exportParams = new ExportParams();