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 4acac7aea5..71d969f8af 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -647,12 +647,14 @@ public class DataSetTableService {
 
     private String saveFile(MultipartFile file) throws Exception {
         String filename = file.getOriginalFilename();
+        String suffix = filename.substring(filename.lastIndexOf(".") + 1);
+        filename = Md5Utils.md5(filename.substring(0, filename.length() - suffix.length()));
         String dirPath = path + AuthUtils.getUser().getUsername() + "/";
         File p = new File(dirPath);
         if (!p.exists()) {
             p.mkdirs();
         }
-        String filePath = dirPath + filename;
+        String filePath = dirPath + filename + "." + suffix;
         File f = new File(filePath);
         FileOutputStream fileOutputStream = new FileOutputStream(f);
         fileOutputStream.write(file.getBytes());
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 28a4bd5fe5..d6101d2ad0 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -273,11 +273,11 @@ public class ExtractDataService {
         jobExecutionConfiguration.setRepository(repository);
         String lastCarteObjectId = Job.sendToSlaveServer(jobMeta, jobExecutionConfiguration, repository, null);
         SlaveServerJobStatus jobStatus = null;
-        boolean running = true;
-        while(running) {
+        boolean executing = true;
+        while(executing) {
             jobStatus = remoteSlaveServer.getJobStatus(jobMeta.getName(), lastCarteObjectId, 0);
-            running = jobStatus.isRunning();
-            if(!running)
+            executing = jobStatus.isRunning() || jobStatus.isWaiting();
+            if(!executing)
                 break;
             Thread.sleep(1000);
         }