From 129152ce22f682a9f8390a01d46f70b7d4e5ed2f Mon Sep 17 00:00:00 2001
From: Hoky <303455184@qq.com>
Date: Tue, 1 Mar 2022 15:23:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-67359=20=E6=A8=A1=E6=9D=BF-=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0-=E7=82=B9=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94=201.?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E6=8E=A5=E5=8F=A3=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/report/ReportWatermarkAction.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java
index a07f42456f..92d14334d6 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportWatermarkAction.java
@@ -1,8 +1,6 @@
 package com.fr.design.actions.report;
 
 import com.fr.base.iofile.attr.WatermarkAttr;
-
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.JWorkBookAction;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.mainframe.DesignerContext;
@@ -39,7 +37,7 @@ public class ReportWatermarkAction extends JWorkBookAction {
             return;
         }
         final WorkBook wbTpl = jwb.getTarget();
-        WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplate(wbTpl);
+        WatermarkAttr watermark = ReportUtils.getWatermarkAttrFromTemplateAndGlobal(wbTpl);
         final WatermarkSettingPane watermarkPane = new WatermarkSettingPane();
         watermarkPane.populate(watermark);
         watermarkPane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {