From 618fc17fa4bd9d09e065f9647012aa4e9cb9d654 Mon Sep 17 00:00:00 2001
From: Hoky <303455184@qq.com>
Date: Thu, 30 Dec 2021 15:38:52 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-9928=20=E9=87=8D=E6=9E=84=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E5=8A=A0=E8=BD=BD=201.=E9=80=82=E9=85=8D=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/report/WatermarkSettingPane.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 0cc211c5f..d4e9a902b 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
@@ -42,13 +42,13 @@ public class WatermarkSettingPane extends AbstractTemplateServerSettingPane {
     }
 
     public void populate(WatermarkAttr watermark) {
-        if (!watermark.isValid()) {
+        if (watermark.getWaterMarkProvider().equals("TEMPLATE")) {
+            chooseComboBox.setSelectedIndex(SINGLE_SET);
+            watermarkPane.populate(watermark);
+        } else {
             chooseComboBox.setSelectedIndex(SERVER_SET);
             populateServerSettings();
-            return;
         }
-        chooseComboBox.setSelectedIndex(SINGLE_SET);
-        watermarkPane.populate(watermark);
     }