From cdace51197a7acf10033cc12f2dce3a7aad326e8 Mon Sep 17 00:00:00 2001
From: 严俊东 <1172482914@qq.com>
Date: Tue, 20 Jul 2021 12:49:22 +0800
Subject: [PATCH] code=401时request方法没有返回Promise.reject 修复
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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..f13b866 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())
{
@@ -537,7 +541,10 @@
}
else if (ColumnType.NUMERIC == attr.cellType())
{
- cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ if (StringUtils.isNotNull(value))
+ {
+ cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ }
}
else if (ColumnType.IMAGE == attr.cellType())
{
@@ -1059,7 +1066,7 @@
}
else
{
- if ((Double) val % 1 > 0)
+ if ((Double) val % 1 != 0)
{
val = new BigDecimal(val.toString());
}
--
Gitblit v1.9.2