From f0792fca6d0874de97411af39c4d58d0c120412f Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期六, 09 十一月 2024 17:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 8 ++++++--
1 files changed, 6 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 850626d..81c0188 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
@@ -430,9 +430,11 @@
{
if (val instanceof String)
{
+ System.out.println("====++++++++");
+ System.out.println(val);
if(((String) val).contains("/"))
val = ((String) val).replace("/","-");
-
+ System.out.println(val);
val = DateUtils.parseDate(val);
}
else if (val instanceof Double)
@@ -1574,8 +1576,10 @@
for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
{
Cell cell = row.getCell(i);
- if (cell != null && cell.getCellType() != CellType.BLANK)
+// System.out.println("11111111111111:/"+(cell != null)+"\n2222222222:/"+cell+"\n333333:/"+String.valueOf(cell).length());
+ if (cell != null && cell.getCellType() != CellType.BLANK && !cell.toString().equals(""))
{
+// System.out.println("444444+/"+(cell.getCellType()));
return false;
}
}
--
Gitblit v1.9.1