diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
index dcde4716b0..9c932f0370 100644
--- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
+++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
@@ -1,7 +1,6 @@
 package com.fr.design.data;
 
 import com.fanruan.ComponentUtils;
-import com.fanruan.config.impl.data.TableDataConfigProviderFactory;
 import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
 import com.fr.concurrent.NamedThreadFactory;
@@ -20,6 +19,7 @@ import com.fr.data.impl.storeproc.StoreProcedureHelper;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
+import com.fr.design.data.datapane.preview.TableDataBeanHelper;
 import com.fr.design.data.tabledata.wrapper.MultiResultTableDataNameWrapper;
 import com.fr.design.data.tabledata.wrapper.MultiResultTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.ServerTableDataWrapper;
@@ -316,7 +316,7 @@ public abstract class DesignTableDataManager {
             names.add(entry.getKey());
         }
         //服务器数据集
-        Map<String, TableData> tableDatas = TableDataConfigProviderFactory.getInstance().getTableDatas();
+        Map<String, TableData> tableDatas = TableDataBeanHelper.getServerTableDatas();
         for (Map.Entry<String, TableData> entry : tableDatas.entrySet()) {
             names.add(entry.getKey());
         }
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java
index 5efe1c8908..29750d1294 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java
@@ -198,9 +198,8 @@ public class TableDataBeanHelper {
             tableData.setPageQuerySql(DataEncryptionHelper.decrypt(bean.getPageQuery()));
         }
         Connection connection = connectionMap.get(bean.getDatabase());
-        if (connection != null) {
-            tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase()));
-        } else {
+        tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase()));
+        if (connection == null) {
             FineLoggerFactory.getLogger().info("not find conn by {}", bean.getDatabase());
         }
         String sql = SqlUtils.clearSqlComments(DataEncryptionHelper.decrypt(bean.getQuery()));