From 914aa241de62f41ef830b013e1b7726ef089f7cf Mon Sep 17 00:00:00 2001
From: Hoky <303455184@qq.com>
Date: Wed, 5 Jan 2022 20:07:14 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-65474=20=E8=AE=BE=E8=AE=A1=E5=99=A8-?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=EF=BC=8C=E5=B9=B3=E5=8F=B0=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=BC=80=E5=85=B3=EF=BC=8C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=8F=98=E6=88=90=E4=BA=86=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E8=AE=BE=E7=BD=AE=201.=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=B0=B4=E5=8D=B0=EF=BC=8C=E5=BD=93=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B0=B4=E5=8D=B0=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=9B=E8=A1=8C=E9=85=8D=E7=BD=AE=E5=8D=B3=E5=8F=AF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/report/WatermarkSettingPane.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
index e79bfcf6b..f3de6eef9 100644
--- a/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/WatermarkSettingPane.java
@@ -34,6 +34,7 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     @Override
     protected void populateServerSettings() {
         WatermarkAttr watermarkAttr = ReportUtils.getWatermarkAttrFromServerConfig();
+        watermarkAttr.setValid(true);
         watermarkPane.populate(watermarkAttr);
     }
 
@@ -55,8 +56,9 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
 
     public WatermarkAttr update() {
         WatermarkAttr watermark = watermarkPane.update();
-        if (isUsingServerSettings()) {
-            watermark.setValid(false);
+        if (!isUsingServerSettings()) {
+            watermark.setValid(true);
+            watermark.setWaterMarkProvider(WaterMarkProvideConstant.TEMPLATE);
         }
         return watermark;
     }