ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2020-05-13 14:18:12 +08:00
parent e2428714a0
commit 1abab026dd
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelReader.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.IterUtil; import cn.hutool.core.collection.IterUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -239,6 +240,7 @@ public class ExcelReader extends ExcelBase<ExcelReader> {
List rowList; List rowList;
for (int i = startRowIndex; i <= endRowIndex; i++) { for (int i = startRowIndex; i <= endRowIndex; i++) {
rowList = readRow(i); rowList = readRow(i);
Console.log("### {}: {}", i, rowList);
if (CollUtil.isNotEmpty(rowList) || false == ignoreEmptyRow) { if (CollUtil.isNotEmpty(rowList) || false == ignoreEmptyRow) {
if (null == rowList) { if (null == rowList) {
rowList = new ArrayList<>(0); rowList = new ArrayList<>(0);

14
hutool-poi/src/test/java/cn/hutool/poi/excel/test/ExcelReadTest.java
View File

@ -1,17 +1,16 @@
package cn.hutool.poi.excel.test; package cn.hutool.poi.excel.test;
import java.util.List;
import java.util.Map;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelReader;
import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import java.util.List;
import java.util.Map;
/** /**
* Excel读取单元测试 * Excel读取单元测试
@ -208,4 +207,5 @@ public class ExcelReadTest {
Assert.assertEquals(11L, read.get(1).get(2)); Assert.assertEquals(11L, read.get(1).get(2));
Assert.assertEquals(11L, read.get(2).get(2)); Assert.assertEquals(11L, read.get(2).get(2));
} }
} }