From fd6c023c78beaeede8cdc132bf17d3e0ad5ba052 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Wed, 10 Jun 2020 16:00:34 +0800
Subject: [PATCH] fix bug

---
 CHANGELOG.md                                     |  1 +
 .../main/java/cn/hutool/poi/word/TableUtil.java  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c53471d78..79437d31c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ### Bug修复
 * 【json   】     修复append方法导致的JSONConfig传递失效问题（issue#906@Github）
 * 【core   】     修复CollUtil.subtractToList判断错误（pr#915@Github）
+* 【poi    】     修复WordWriter写表格问题（pr#914@Github）
 
 -------------------------------------------------------------------------------------------------------------
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
index dc330890e..a3eb3c991 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
@@ -1,19 +1,18 @@
 package cn.hutool.poi.word;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFTable;
-import org.apache.poi.xwpf.usermodel.XWPFTableCell;
-import org.apache.poi.xwpf.usermodel.XWPFTableRow;
-
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.usermodel.XWPFTable;
+import org.apache.poi.xwpf.usermodel.XWPFTableCell;
+import org.apache.poi.xwpf.usermodel.XWPFTableRow;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Word中表格相关工具
@@ -69,6 +68,7 @@ public class TableUtil {
 	public static void writeRow(XWPFTableRow row, Object rowBean, boolean isWriteKeyAsHead) {
 		if (rowBean instanceof Iterable) {
 			writeRow(row, (Iterable<?>) rowBean);
+			return;
 		}
 		
 		Map rowMap = null;