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 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, //提交表单标识