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 mergeRegion

Browse Source
This commit is contained in:
Looly 2020-10-15 18:49:34 +08:00
parent fb46196782
commit cb761ffea2
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@
* 【core 】 解决ListUtil计算总量可能的int溢出问题（pr#1150@Github）
* 【json 】 解决JSON中转换为double小数精度丢失问题（pr#192@Gitee）
* 【core 】 修复CaseInsensitiveMap的remove等方法并没有忽略大小写的问题（pr#1163@Gitee）
* 【poi 】 修复合并单元格值读取错误的问题
-------------------------------------------------------------------------------------------------------------

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

@ -103,7 +103,7 @@ public class CellUtil {
cellType = cell.getCellTypeEnum();
}
if(CellType.BLANK == cellType){
if(CellType.BLANK == cellType || CellUtil.isMergedRegion(cell)){
// 空白单元格可能为合并单元格
cell = getMergedRegionCell(cell);
cellType = cell.getCellTypeEnum();

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

@ -215,9 +215,12 @@ public class ExcelReadTest {
}
@Test
@Ignore
public void readTest() {
final ExcelReader reader = ExcelUtil.getReader("d:/test/人员体检信息表.xlsx");
final List<List<Object>> read = reader.read();
// Console.log(read);
final List<List<Object>> read = reader.read(2);
for (List<Object> list : read) {
Console.log(list);
}
}
}