From 6fe9a358b7c09ddb2a4e4941f887e90b7f5f415a Mon Sep 17 00:00:00 2001
From: yvan7123 <yangfan7123@gmail.com>
Date: 星期二, 06 四月 2021 11:47:27 +0800
Subject: [PATCH] update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java.
---
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