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

Pre Merge pull request !748 from 雨伦/dev

Browse Source
This commit is contained in:
雨伦 2025-08-26 07:08:13 +00:00 committed by Gitee
commit 1f71d53629
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
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);