From 58236a0d3734939f4efc5504fb1cb8905fddf08c Mon Sep 17 00:00:00 2001
From: zhengyulun <zhengyulun@vip.qq.com>
Date: Tue, 26 Aug 2025 15:06:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=BC=E5=87=BAExcel=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=90=88=E5=B9=B6=E5=88=97=EF=BC=8C=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=97=E7=9A=84=E7=AC=AC=E4=B8=80=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/common/excel/core/CellMergeHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java
index dd37b6795..d54e12855 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeHandler.java
@@ -73,7 +73,7 @@ public class CellMergeHandler {
                 Object val = ReflectUtils.invokeGetter(rowObj, field.getName());
 
                 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));
                 } else {
                     RepeatCell repeatCell = map.get(field);