diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java
index c6147eb..60160fc 100644
--- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java
+++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ImportServiceImpl.java
@@ -414,7 +414,7 @@ public class ImportServiceImpl implements ImportService {
         nameList = new ArrayList<>();
         namePhoneList = new ArrayList<>();
         map = new HashMap<>();
-        String encoding = "UTF-8";
+        String encoding = "GBK";
         ZipFile zipFile = new ZipFile(path);
         zipFile.setFileNameCharset(encoding);
         List<FileHeader> list = zipFile.getFileHeaders();
@@ -440,7 +440,6 @@ public class ImportServiceImpl implements ImportService {
                     String name = fileName.split("/")[_index + 1];
                     map.put(beforeName, "其他文件".equals(fileName.split("/")[_index + 1]) ? "" : fileName.split("/")[_index + 1]);
                 }
-
                 // 设置编码
                 if (isMessyCode(fileName)) {
                     encoding = "UTF-8";
@@ -450,9 +449,6 @@ public class ImportServiceImpl implements ImportService {
                 nameList.add(fileName);
 
                 try {
-                    if (i == (list.size() - 1)) {
-                        map.put(beforeName, folderName.toString());
-                    }
                     String currentName = fileName.split("/")[_index].split("_")[1];
                     if (!beforeName.equals(currentName)) {
                         // 不相同名称时，对map进行赋值
@@ -460,7 +456,9 @@ public class ImportServiceImpl implements ImportService {
                         beforeName = currentName;
                         folderName = new StringBuilder();
                     }
-
+                    if (i == (list.size() - 1)) {
+                        map.put(beforeName, folderName.toString());
+                    }
                     if (!"其他文件".equals(fileName.split("/")[_index + 1])) {
                         folderName.append(fileName.split("/")[_index + 1]).append(",");
                     }
@@ -468,10 +466,6 @@ public class ImportServiceImpl implements ImportService {
                         folderName.append(fileName.split("/")[_index + 1]).append(",");
                     }
 
-                    if (i == list.size() - 1) {
-                        map.put(beforeName, folderName.toString());
-                    }
-
                     // 使用set方法对名称进行过滤 保持namePhoneList数据的唯一性
                     if (uniqueNames.add(currentName)) {
                         namePhoneList.add(currentName);
@@ -479,6 +473,8 @@ public class ImportServiceImpl implements ImportService {
                 } catch (ArrayIndexOutOfBoundsException e) {
                     log.error("文件导入识别到不存在文件夹的文件");
                 }
+            }else if (i == (list.size() - 1)){
+                map.put(beforeName, folderName.toString());
             }
             i++;
         }