From de1823591a01addd54cb1aab4d78397dcb020472 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期一, 07 十月 2024 23:14:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 +++- 1 files changed, 3 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 37ea80f..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 @@ -1576,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