From 9e6b2a12650c5a6d24be3de8c078d31e7548750e Mon Sep 17 00:00:00 2001
From: yuhong0206@sina.cn <yuhong0206@sina.cn>
Date: Mon, 29 Mar 2021 08:56:51 +0800
Subject: [PATCH] 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
index 4173956..3de26bb 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
@@ -131,7 +131,7 @@
vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };
stripComment = true;
encodeQuotes = true;
- alwaysMakeTags = true;
+ alwaysMakeTags = false;
}
/**
@@ -208,7 +208,7 @@
s = processRemoveBlanks(s);
- s = validateEntities(s);
+ // s = validateEntities(s);
return s;
}
@@ -245,6 +245,7 @@
// try and form html
//
s = regexReplace(P_END_ARROW, "", s);
+ // 不追加结束标签
s = regexReplace(P_BODY_TO_END, "<$1>", s);
s = regexReplace(P_XML_CONTENT, "$1<$2", s);
--
Gitblit v1.9.2