From 1a4503a242ca89a06448b5aa73aaa12bf8c163f0 Mon Sep 17 00:00:00 2001
From: rinoux <rinoux@foxmail.com>
Date: Tue, 28 Dec 2021 17:21:15 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-65087=20=E5=85=B1=E4=BA=AB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/data/tabledata/tabledatapane/DBTableDataPane.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
index 173da2fbf7..1746330f11 100644
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
@@ -715,8 +715,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 if (useGlobal(getTableData(), strategyConfig)) {
                     //使用全局配置
                     strategyConfig = StrategyConfigHelper.createStrategyConfig(true);
-                } else if (getTableData().isShare()) {
-                    //使用共享数据集兼容配置
+                } else if (strategyConfig == null && getTableData().isShare()) {
+                    //没有配置时，使用共享数据集兼容配置
                     strategyConfig = StrategyConfigHelper.createStrategyConfig(true, false, true);
                 }
             }