From c68dc8671749787e0ea12a90291e4c0bf1d9a5b7 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Thu, 7 Nov 2019 17:15:33 +0800
Subject: [PATCH] fix

---
 designer-realize/src/main/java/com/fr/grid/GridUI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/grid/GridUI.java b/designer-realize/src/main/java/com/fr/grid/GridUI.java
index 41ea56513..1ae96b61b 100644
--- a/designer-realize/src/main/java/com/fr/grid/GridUI.java
+++ b/designer-realize/src/main/java/com/fr/grid/GridUI.java
@@ -478,7 +478,7 @@ public class GridUI extends ComponentUI {
             // peter:对于合并的单元格,需要先白色的背景来清除背景.
             if (tmpCellElement.getColumnSpan() > 1 || tmpCellElement.getRowSpan() > 1) {
                 // REPORT-23492 要看下是否设置了纸张背景 如果设置了按照背景来画
-                ReportSettingsProvider reportSettings = getReportSettings(reportPane.getEditingElementCase());
+                ReportSettingsProvider reportSettings = getReportSettings(report);
                 Background currentBackground = reportSettings.getBackground();
                 if (currentBackground != null) {
                     currentBackground.paint(g2d, this.cell_back_rect);