From 693afd3328ff507483d491d13af0247dd93746b9 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 22 Jun 2022 18:39:46 +0800 Subject: [PATCH] fix bug --- .../src/main/java/cn/hutool/poi/excel/ExcelWriter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java index 57b4f6d42..be120e751 100755 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java @@ -1005,9 +1005,6 @@ public class ExcelWriter extends ExcelBase { */ @SuppressWarnings({"rawtypes", "unchecked"}) public ExcelWriter writeRow(final Object rowBean, final boolean isWriteKeyAsHead) { - if (rowBean instanceof Iterable) { - return writeRow((Iterable) rowBean); - } final Map rowMap; if (rowBean instanceof Map) { if (MapUtil.isNotEmpty(this.headerAlias)) { @@ -1015,6 +1012,10 @@ public class ExcelWriter extends ExcelBase { } else { rowMap = (Map) rowBean; } + }else if(rowBean instanceof Iterable){ + // issue#2398@Github + // MapWrapper由于实现了Iterable接口,应该优先按照Map处理 + return writeRow((Iterable) rowBean); } else if (rowBean instanceof Hyperlink) { // Hyperlink当成一个值 return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead);