From decda097e2f0aa3d13c73339781840a939c3766f Mon Sep 17 00:00:00 2001 From: hower Date: Mon, 29 May 2023 00:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/poi/excel/ExcelWriter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 fbb5bf0d1..3f67bb596 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 @@ -1106,7 +1106,7 @@ public class ExcelWriter extends ExcelBase { * @param isWriteKeyAsHead 是否将Map的Key作为表头输出，如果为True第一行为表头，紧接着为values * @return this */ - public ExcelWriter writeCol(Map colMap, boolean isWriteKeyAsHead){ + public ExcelWriter writeCol(Map> colMap, boolean isWriteKeyAsHead){ return writeCol(colMap, 0, isWriteKeyAsHead); } @@ -1121,11 +1121,11 @@ public class ExcelWriter extends ExcelBase { * @param isWriteKeyAsHead 是否将Map的Key作为表头输出，如果为True第一行为表头，紧接着为values * @return this */ - public ExcelWriter writeCol(Map colMap, int startColIndex, boolean isWriteKeyAsHead){ + public ExcelWriter writeCol(Map> colMap, int startColIndex, boolean isWriteKeyAsHead){ for (Object k : colMap.keySet()) { - Object v = colMap.get(k); - if(v instanceof Iterable){ - writeCol(isWriteKeyAsHead?k:null,startColIndex, (Iterable) v, startColIndex != colMap.size() - 1); + Iterable v = colMap.get(k); + if(v != null){ + writeCol(isWriteKeyAsHead?k:null,startColIndex, v, startColIndex != colMap.size() - 1); startColIndex ++; } }