opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 17:38:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 导出Excel时设置合并列，指定合并列的第一行数据为空时导致后续无法正常合并

Browse Source
This commit is contained in:
zhengyulun 2025-08-26 15:06:12 +08:00
parent c01ed34602
commit 58236a0d37
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java
View File

@ -73,7 +73,7 @@ public class CellMergeHandler {
Object val = ReflectUtils.invokeGetter(rowObj, field.getName()); Object val = ReflectUtils.invokeGetter(rowObj, field.getName());
int colNum = mergeFieldsIndex.get(j); int colNum = mergeFieldsIndex.get(j);
if (!map.containsKey(field)) { if (!map.containsKey(field) || (map.get(field).value() == null && val != null)) {
map.put(field, new RepeatCell(val, i)); map.put(field, new RepeatCell(val, i));
} else { } else {
RepeatCell repeatCell = map.get(field); RepeatCell repeatCell = map.get(field);