From 9b9c1b999fe0b1e21c038a1d5227609071fd7aa4 Mon Sep 17 00:00:00 2001
From: yuhong0206@sina.cn <yuhong0206@sina.cn>
Date: 星期一, 29 三月 2021 09:00:44 +0800
Subject: [PATCH] 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index b1f36af..15612b9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -229,6 +229,10 @@
{
// 从第2行开始取数据,默认第一行是表头.
Row row = sheet.getRow(i);
+ if(row == null)
+ {
+ continue;
+ }
T entity = null;
for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet())
{
@@ -1059,7 +1063,7 @@
}
else
{
- if ((Double) val % 1 > 0)
+ if ((Double) val % 1 != 0)
{
val = new BigDecimal(val.toString());
}
--
Gitblit v1.9.2