diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index db1d2d1208..2b30b0ae43 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -664,6 +664,7 @@ public class DataSetTableService {
                         tableFiled.setFieldName(readCell(row.getCell(j)));
                         tableFiled.setRemarks(readCell(row.getCell(j)));
                         tableFiled.setFieldType("TEXT");
+                        tableFiled.setFieldSize(1024);
                         if(StringUtils.isEmpty(tableFiled.getFieldName())){
                             continue;
                         }
@@ -698,6 +699,9 @@ public class DataSetTableService {
                         tableFiled.setRemarks(readCell(row.getCell(j)));
                         tableFiled.setFieldType("TEXT");
                         tableFiled.setFieldSize(1024);
+                        if(StringUtils.isEmpty(tableFiled.getFieldName())){
+                            continue;
+                        }
                         fields.add(tableFiled);
                     } else {
                         r[j] = readCell(row.getCell(j));
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index c9b6f325aa..acf72d5034 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -497,8 +497,14 @@ public class ExtractDataService {
     }
 
     private StepMeta excelInputStep(String filePath, List<DatasetTableField> datasetTableFields) {
+        String suffix = filePath.substring(filePath.lastIndexOf(".") + 1);
         ExcelInputMeta excelInputMeta = new ExcelInputMeta();
-        excelInputMeta.setSpreadSheetType(SpreadSheetType.SAX_POI);
+        if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) {
+            excelInputMeta.setSpreadSheetType(SpreadSheetType.SAX_POI);
+        }
+        if (StringUtils.equalsIgnoreCase(suffix, "xls")) {
+            excelInputMeta.setSpreadSheetType(SpreadSheetType.JXL);
+        }
         excelInputMeta.setPassword("Encrypted");
         excelInputMeta.setFileName(new String[]{filePath});
         excelInputMeta.setStartsWithHeader(true);