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/core/text/CharsetKit.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 8297661..4fa575c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -66,7 +66,7 @@
if (null == destCharset)
{
- srcCharset = StandardCharsets.UTF_8;
+ destCharset = StandardCharsets.UTF_8;
}
if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
--
Gitblit v1.9.2