From db68b820a27003a6d0bea46ecfd610b6f34b324c Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 12 Aug 2024 10:28:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E9=A1=BA=E5=BA=8F=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FileSplitItemsEOServiceImpl.java      | 10 +++++-----
 .../java/com/jero/modules/tag/enums/TableNameEnum.java |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 670aca51..64904e3b 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -1372,7 +1372,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         //此处需要做各种验证，数据库操作
         try {
             // 查询全部字段列表
-            List<LawsTag> fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName());
+            List<LawsTag> fieldLists = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
             // 列表展示字段
             List<LawsTag> fieldListSelect = fieldLists.stream().filter(v -> YesOrNoEnum.YES.getValue()
                     .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
@@ -1940,9 +1940,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             //删除原上传文件
             FileUnZip.deleteDir(saveDirectory);
             if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
-                resultMsg = "压缩包内不存在文件夹";
+                resultMsg = "读取失败，压缩包内需要把所有导入文件放入一个父级文件夹下";
             }else{
-                resultMsg = "No folder exists in the compressed package";
+                resultMsg = "The data fails to be read. In the compressed package, all imported files need to be placed in a parent folder";
             }
             return Result.error(1, resultMsg);
         }
@@ -3698,7 +3698,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
     private List<Map<String, Object>> getImportOnlField(String flag, String cut) {
 //        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag);
         // 查询全部字段列表
-        List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName());
+        List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
         // 列表展示字段
         fieldList = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
                 .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
@@ -4402,7 +4402,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
 
         // 查询全部字段列表
-        List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT_IMPORT.getTableName());
+        List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
         // 列表展示字段
         List<String> fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
                 .equals(String.valueOf(v.getIsShowList()))).map(LawsTag::getDbFieldName).collect(Collectors.toList());
diff --git a/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java b/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java
index a5782d75..ab4014e0 100644
--- a/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java
+++ b/laws-modules/src/main/java/com/jero/modules/tag/enums/TableNameEnum.java
@@ -13,8 +13,7 @@ public enum TableNameEnum {
     DOMESTIC_REGULATIONS("外部标准","laws_domestic_standard","1"),
     ENTERPRISE_STANDARDS("企业标准","laws_enterprise_standard","3"),
     DOCUMENT_SPLIT("条款拆分","laws_document_split","4"),
-    HOME_SEARCH("高级搜索（全部）","home_search","5"),
-    DOCUMENT_SPLIT_IMPORT("条款拆分_导入用","laws_document_split_import",""),
+    HOME_SEARCH("高级搜索（全部）","home_search","5")
     ;
 
     String name;