From f4f2060dfcbb8dea6586a8c138935835dff594ef Mon Sep 17 00:00:00 2001
From: rinoux <rinoux@foxmail.com>
Date: Tue, 31 Aug 2021 09:29:42 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-57986=20=E5=8F=AA=E6=98=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=98=AF=E4=B8=8D=E6=98=AF=E4=BD=BF=E7=94=A8=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E8=80=8C=E4=B8=8D=E6=98=AF=E8=8E=B7=E5=8F=96=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=BC=80=E5=90=AF=E5=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tabledata/tabledatapane/DBTableDataPane.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 453e4bc946..c57dfe00dd 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
@@ -710,7 +710,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
                 strategyConfig = StrategyConfigAttrUtils.getStrategyConfig(dsName);
 
 
-                if (useGlobal(getTableData(), strategyConfig, tplPath)) {
+                if (useGlobal(getTableData(), strategyConfig)) {
                     //使用全局配置
                     strategyConfig = StrategyConfigHelper.createStrategyConfig(true);
                 } else if (getTableData().isShare()) {
@@ -722,14 +722,13 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             return strategyConfig;
         }
 
-        private boolean useGlobal(DBTableData dbTableData, StrategyConfig strategyConfig, String tplPath) {
+        private boolean useGlobal(DBTableData dbTableData, StrategyConfig strategyConfig) {
             //非共享且配置为空或者指定使用全局配置时，检查是否全局开启
-            if (!dbTableData.isShare() && (strategyConfig == null || strategyConfig.isUseGlobal())) {
-                //模版里面没有配置，检查模版是否被开启
-                return StrategyConfigService.isTemplateEnabled(tplPath);
+            if (strategyConfig == null) {
+                return !dbTableData.isShare();
+            } else {
+                return strategyConfig.isUseGlobal();
             }
-
-            return false;
         }
 
         @Override