lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-02 20:02:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly 2020-06-10 16:00:34 +08:00
parent c4b2405325
commit fd6c023c78
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@
### Bug修复 ### Bug修复
* 【json 】 修复append方法导致的JSONConfig传递失效问题（issue#906@Github） * 【json 】 修复append方法导致的JSONConfig传递失效问题（issue#906@Github）
* 【core 】 修复CollUtil.subtractToList判断错误（pr#915@Github） * 【core 】 修复CollUtil.subtractToList判断错误（pr#915@Github）
* 【poi 】 修复WordWriter写表格问题（pr#914@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------

16
hutool-poi/src/main/java/cn/hutool/poi/word/TableUtil.java
View File

@ -1,19 +1,18 @@
package cn.hutool.poi.word; 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.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.IterUtil; import cn.hutool.core.collection.IterUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil; 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中表格相关工具 * Word中表格相关工具
@ -69,6 +68,7 @@ public class TableUtil {
public static void writeRow(XWPFTableRow row, Object rowBean, boolean isWriteKeyAsHead) { public static void writeRow(XWPFTableRow row, Object rowBean, boolean isWriteKeyAsHead) {
if (rowBean instanceof Iterable) { if (rowBean instanceof Iterable) {
writeRow(row, (Iterable<?>) rowBean); writeRow(row, (Iterable<?>) rowBean);
return;
} }
Map rowMap = null; Map rowMap = null;