diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 968e925da1..9d2416be1a 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -2169,7 +2169,7 @@ public class DataSetTableService {
                     datasetTableField.setType(field.getFieldType());
                     datasetTableField.setSize(field.getFieldSize());
                     datasetTableField.setAccuracy(field.getAccuracy());
-                    if (ObjectUtils.isEmpty(ds)) {
+                    if (StringUtils.isEmpty(datasetTable.getDataSourceId())) {
                         datasetTableField.setDeExtractType(transFieldType(field.getFieldType()));
                     } else {
                         Integer fieldType = qp.transFieldType(field.getFieldType());
@@ -2185,7 +2185,7 @@ public class DataSetTableService {
                         datasetTableField.setDataeaseName(TableUtils.columnName(field.getFieldName()));
                     }
                     datasetTableField.setType(field.getFieldType());
-                    if (ObjectUtils.isEmpty(ds)) {
+                    if (StringUtils.isEmpty(datasetTable.getDataSourceId())) {
                         datasetTableField.setDeType(transFieldType(field.getFieldType()));
                         datasetTableField.setDeExtractType(transFieldType(field.getFieldType()));
                     } else {
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 21609407cf..6568f9d859 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -646,7 +646,7 @@ public class ExtractDataService {
         JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(engine);
-        datasourceRequest.setQuery("mysql> SELECT VERSION();");
+        datasourceRequest.setQuery("SELECT VERSION()");
         String version = jdbcProvider.getData(datasourceRequest).get(0)[0];
         DDLProvider ddlProvider = ProviderFactory.getDDLProvider(engine.getType());
         datasourceRequest.setQuery(ddlProvider.createTableSql(tableName, datasetTableFields, engine, version));