From 83f2033190feb57d81507999e680dac07597e57e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 11 Aug 2024 18:18:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088410=20=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93--=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E6=9C=89=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java | 9 +++++++++
 .../impl/LawsEvaluationNotMetLibraryServiceImpl.java     | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
index 15098d99..426830ca 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.assessmentLibrary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -174,6 +175,14 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
 
             this.settleDocuments(url, recordsExport);
 
+            // 去除文本的<p>
+            String regex = "<[^>]*>";
+            recordsExport.forEach(detail -> {
+                if (StrUtil.isNotBlank(detail.getTermContent())) {
+                    detail.setTermContent(detail.getTermContent().replaceAll(regex, ""));
+                }
+            });
+
             // 生成excel
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.HSSF);
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index 6cfa5780..6860aaa6 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -119,6 +119,14 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
 
             excelExportUtilPro.settleDocuments(url, records, LawsEvaluationNotMetLibrary::obtainFileIds, LawsEvaluationNotMetLibrary::setFileList);
 
+            // 去除文本的<p>
+            String regex = "<[^>]*>";
+            records.forEach(detail -> {
+                if (StrUtil.isNotBlank(detail.getTermContent())) {
+                    detail.setTermContent(detail.getTermContent().replaceAll(regex, ""));
+                }
+            });
+
             // 生成excel
             ExportParams exportParams = new ExportParams();
             exportParams.setType(ExcelType.HSSF);