From 2027dae30b82365a84988d057c2a9240d233971c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 04 六月 2021 16:12:43 +0800
Subject: [PATCH] !49 同步dev分支 Merge pull request !49 from 疯狂的狮子Li/dev
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 5 ++++-
1 files changed, 4 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 073ece3..619ec80 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
@@ -513,7 +513,10 @@
}
else if (ColumnType.NUMERIC == attr.cellType())
{
- cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ if (Validator.isNotNull(value))
+ {
+ cell.setCellValue(StrUtil.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
+ }
}
else if (ColumnType.IMAGE == attr.cellType())
{
--
Gitblit v1.9.3