zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly
2022-06-22 18:39:46 +08:00
parent beb3dd248d
commit 693afd3328
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
View File

@@ -1005,9 +1005,6 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
*/ */
@SuppressWarnings({"rawtypes", "unchecked"}) @SuppressWarnings({"rawtypes", "unchecked"})
public ExcelWriter writeRow(final Object rowBean, final boolean isWriteKeyAsHead) { public ExcelWriter writeRow(final Object rowBean, final boolean isWriteKeyAsHead) {
if (rowBean instanceof Iterable) {
return writeRow((Iterable<?>) rowBean);
}
final Map rowMap; final Map rowMap;
if (rowBean instanceof Map) { if (rowBean instanceof Map) {
if (MapUtil.isNotEmpty(this.headerAlias)) { if (MapUtil.isNotEmpty(this.headerAlias)) {
@@ -1015,6 +1012,10 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
} else { } else {
rowMap = (Map) rowBean; rowMap = (Map) rowBean;
} }
}else if(rowBean instanceof Iterable){
// issue#2398@Github
// MapWrapper由于实现了Iterable接口，应该优先按照Map处理
return writeRow((Iterable<?>) rowBean);
} else if (rowBean instanceof Hyperlink) { } else if (rowBean instanceof Hyperlink) {
// Hyperlink当成一个值 // Hyperlink当成一个值
return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead); return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead);