From 47ab3ed3c60a1627ca82aebd28f334716b333e2a Mon Sep 17 00:00:00 2001
From: wangchengjun <wangchengjun@syxysoft.com>
Date: Fri, 8 Apr 2022 02:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=AF=BC=E5=85=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../split/service/impl/FileSplitItemsEOServiceImpl.java     | 6 +++---
 .../views/documentManage/splitting/modules/ImportResult.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 6eb8fb384..650a22b7c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -3119,10 +3119,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 .sorted(Comparator.comparing(OnlCgformField::getOrderNum)) // 必须按顺序 才能导出时表头和数据一致
                 .collect(Collectors.toList());
        List<String> fieldForExport = new ArrayList<>();
-        if (CutEnum.CN.getValue().equals(cut)){
-            fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
-        } else {
+        if (CutEnum.EN.getValue().equals(cut)){
             fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList());
+        } else {
+            fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList());
         }
         return StringUtils.join(fieldForExport, ",").split(",");
     }
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index 211c5d3ff..1b5bf11ef 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -137,7 +137,7 @@
         OperationList:[],
         upload1:this.$t('upload1'),
         // accept:'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/msword',
-        accept:'application/zip',
+        accept:'application/x-zip-compressed',
         rows:[],
         token:Vue.ls.get(ACCESS_TOKEN),
         flag:false,  //提交表单标识