From 3a407132b62ceabcf0f2883becfc24a31a66870f Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 10 Nov 2023 17:46:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):?=
 =?UTF-8?q?=2078378?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compare/controller/SarFileCompareInfoController.java        | 2 +-
 .../compare/service/impl/SarFileCompareInfoServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
index 84ba1309..eb79735c 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
@@ -380,7 +380,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
             return r;
         } catch (Exception ex) {
             log.error("发起文档对比失败：" + ex.getMessage());
-            return Result.OK("发起文档对比失败!");
+            return Result.error("发起文档对比失败!");
         }
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
index 23cde341..cd0801f5 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
@@ -163,7 +163,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
                         String rightTxt = rightItemList.get(j).getItemsText();
                         if (null != rightTxt && !rightTxt.isEmpty()) {
                             double similarity = 0;
-                                    // 使用正则表达式判断是否是纯<img>标签，不以</p>结尾，也不以</table>结尾
+                            // 使用正则表达式判断是否是纯<img>标签，不以</p>结尾，也不以</table>结尾
                             String leftTxtTrim = leftTxt.trim();
                             String rightTxtTrim = rightTxt.trim();
                             boolean leftTxtMatches = Pattern.matches("<img[^>]+>(?<!</p>)(?<!</table>)", leftTxtTrim);

From c031c246c49d977fcf77adf7686c32b0ea367d4a Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 10 Nov 2023 18:08:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):?=
 =?UTF-8?q?=2078384?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DocumentSplitController.java   |   2 +-
 .../impl/DocumentSplitServiceImpl.java        |   2 +-
 .../impl/FileSplitItemsEOServiceImpl.java     | 161 +++++++++---------
 3 files changed, 81 insertions(+), 84 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
index 08b322e6..ee6da55b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
@@ -2,9 +2,9 @@ package com.jero.modules.laws.documenttool.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.util.MessageUtils;
-import com.jero.common.api.vo.ResultCommon;
 import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
 import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView;
 import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index baa95767..9dad83cf 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -303,7 +303,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         int count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT);
 
         if(count == -1){
-            if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) {
+            if(LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) {
                 throw new JeroBootException("文档格式错误，请检查文档内容！");
             }else{
                 throw new JeroBootException("The document format is wrong. Please check the document content!");
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 0127c680..e38edc4f 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
@@ -17,10 +17,7 @@ import com.jero.common.constant.enums.ModuleEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
-import com.jero.common.util.DateUtils;
-import com.jero.common.util.MinioUtil;
-import com.jero.common.util.UUIDUtils;
-import com.jero.common.util.oConvertUtils;
+import com.jero.common.util.*;
 import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.document.enums.FieldTypeEnum;
@@ -1505,7 +1502,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
             }
             String msg = "";
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 msg = "成功导入" + countSuccess + "条";
             } else {
                 msg = "import " + countSuccess + " datas successfully";
@@ -1514,7 +1511,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         } catch (Exception e) {
             log.error(e.getMessage(),e);
             String msg = "";
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 msg = "导入失败";
             } else {
                 msg = "import failed";
@@ -1534,7 +1531,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         //判断上传文件必须是zip
         // TODO 允许导入rar
         if (!str.equals("zip")) {
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 resultMsg = "请上传zip文件";
             }else{
                 resultMsg = "Please upload a zip file";
@@ -1556,7 +1553,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             if(excelfilelist.size()<1){
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                if(LanguageEnum.CN.getValue().equals(cut)){
+                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                     resultMsg = "压缩包内没有上传Excel数据";
                 }else{
                     resultMsg = "In the cabinet did not upload the Excel data";
@@ -1566,7 +1563,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             } else if (excelfilelist.size()>1) {
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                if(LanguageEnum.CN.getValue().equals(cut)){
+                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                     resultMsg = "压缩包根目录下仅能存在一个excel为导入数据";
                 }else{
                     resultMsg = "Only one Excel file can be imported in the compressed package root directory";
@@ -1632,7 +1629,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 }else{
                     //删除原上传文件
                     FileUnZip.deleteDir(saveDirectory);
-                    if(LanguageEnum.CN.getValue().equals(cut)){
+                    if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                         resultMsg = "没有可导入的数据,请检查!";
                     }else{
                         resultMsg = "No data to import, please check";
@@ -1641,7 +1638,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 }
             } catch (NoSuchElementException e){
                 FileUnZip.deleteDir(saveDirectory);
-                if(LanguageEnum.CN.getValue().equals(cut)){
+                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                     resultMsg = "没有可导入的数据,请检查!";
                 }else{
                     resultMsg = "No data to import, please check";
@@ -1653,7 +1650,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             } catch (Exception e) {
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                if(LanguageEnum.CN.getValue().equals(cut)){
+                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                     resultMsg = "读取失败，请严格按照模板文件导入数据";
                 }else{
                     resultMsg = "The data fails to be read. Import data strictly according to the template file";
@@ -1663,7 +1660,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         } catch (Exception e) {
             //删除原上传文件
             FileUnZip.deleteDir(saveDirectory);
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 resultMsg = "读取失败，请严格按照模板文件导入数据";
             }else{
                 resultMsg = "The data fails to be read. Import data strictly according to the template file";
@@ -1717,7 +1714,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         OSSFile ossFile = ossFileService.getById(splitFileId);
         String url = ossFile.getUrl();
         if (!MinioUtil.doesObjectExist(url)) {
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 throw new JeroBootException("导入的压缩包不存在！");
             } else {
                 throw new JeroBootException("Importing a compressed package that does not exist!");
@@ -1767,7 +1764,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         if (name.contains(".xlsx")) {
             workbook = WorkbookFactory.create(is);
         } else {
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 throw new JeroBootException("请导入正确模板!");
             } else {
                 throw new JeroBootException("Please import the correct template");
@@ -1791,21 +1788,21 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 //                    cell.setCellType(CellType.STRING);
 //                    String cellValue = cell.getStringCellValue().substring(cell.getStringCellValue().indexOf("*")+1);
 //                    if(!cellValue.equals(titles[i])){
-//                        if(LanguageEnum.CN.getValue().equals(cut)){
+//                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
 //                            throw new JeroBootException("请导入正确模板!");
 //                        } else {
 //                            throw new JeroBootException("Please import the correct template");
 //                        }
 //                    }
 //                } else{
-//                    if(LanguageEnum.CN.getValue().equals(cut)){
+//                    if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
 //                        throw new JeroBootException("请导入正确模板!");
 //                    } else {
 //                        throw new JeroBootException("Please import the correct template");
 //                    }
 //                }
 //            }else{
-//                if(LanguageEnum.CN.getValue().equals(cut)){
+//                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
 //                    throw new JeroBootException("请导入正确模板!");
 //                } else {
 //                    throw new JeroBootException("Please import the correct template");
@@ -1820,21 +1817,21 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 cell.setCellType(CellType.STRING);
                 String cellValue = cell.getStringCellValue();
                 if(!cellValue.contains("模版说明")){
-                    if(LanguageEnum.CN.getValue().equals(cut)){
+                    if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                         throw new JeroBootException("请导入正确模板!");
                     } else {
                         throw new JeroBootException("Please import the correct template");
                     }
                 }
             } else{
-                if(LanguageEnum.CN.getValue().equals(cut)){
+                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                     throw new JeroBootException("请导入正确模板!");
                 } else {
                     throw new JeroBootException("Please import the correct template");
                 }
             }
         }else{
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 throw new JeroBootException("请导入正确模板!");
             } else {
                 throw new JeroBootException("Please import the correct template");
@@ -1966,10 +1963,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         List<String> treeNameList = new ArrayList<>();
         //普通数据字典
         List<String> itemNameList = new ArrayList<>();
-        if (LanguageEnum.CN.getValue().equals(cut)) {
+        if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
             treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
             itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
-        } else if(LanguageEnum.EN.getValue().equals(cut)){
+        } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())){
             treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList());
             itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList());
         }
@@ -1983,7 +1980,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             i++;
             int countError = 0;   //记录失败数据数量
             String errorMsg = "";
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 errorMsg = "第" + i + "行：";
             }else{
                 errorMsg = i + " line：";
@@ -2010,7 +2007,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //树形
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)){
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 }else{
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2019,7 +2016,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
                                 } else {
                                     errorMsg += fieldName + " can not be more than " + dbLength + " char;";
@@ -2035,7 +2032,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         lastValue = valueTemp.substring(valueTemp.lastIndexOf("/")+1);
                                     }
                                     if (!treeNameList.contains(lastValue)) {
-                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             errorMsg += fieldName + "中的" + lastValue + "与数据字典不匹配；";
                                         } else {
                                             errorMsg += fieldName +" "+ lastValue + " does not match the data dictionary;";
@@ -2055,10 +2052,10 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     }
                                     if (treeNameList.contains(lastValue)) {
                                         List<SysCategory> collect = new ArrayList<>();
-                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             String finalLastValue = lastValue;
                                             collect = categoryList.stream().filter(e -> e.getName().equals(finalLastValue)).collect(Collectors.toList());
-                                        } else if(LanguageEnum.EN.getValue().equals(cut)) {
+                                        } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())) {
                                             String finalLastValue1 = lastValue;
                                             collect = categoryList.stream().filter(e -> e.getEnName().equals(finalLastValue1)).collect(Collectors.toList());
                                         }
@@ -2086,7 +2083,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //输入框
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2095,7 +2092,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
                                 } else {
                                     errorMsg += fieldName + " can not be more than" + dbLength + "char;";
@@ -2107,7 +2104,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //输入框(数字）
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2117,7 +2114,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //正则判断仅能为 负号（-），小数点（.）和数字
                             String regexNumber = "^(\\-|\\+)?\\d+(\\.\\d+)?$";
                             if(StringUtils.isNotBlank(value) && !value.matches(regexNumber)){
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "仅能为 负号（-），小数点（.）和数字；";
 
                                 } else {
@@ -2130,7 +2127,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //下拉单选
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2139,7 +2136,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
                                 } else {
                                     errorMsg += fieldName + " can not be more than" + dbLength + "char;";
@@ -2148,7 +2145,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断是否是单选
                             if (StringUtils.isNotBlank(value) && value.contains(",")) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为单选项；";
                                 } else {
                                     errorMsg += fieldName + " is single type;";
@@ -2158,7 +2155,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //判断数据是否匹配
                             if (StringUtils.isNotBlank(value)) {
                                 if (!itemNameList.contains(value)) {
-                                    if(LanguageEnum.CN.getValue().equals(cut)) {
+                                    if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                         errorMsg += fieldName + "中的" + value + "与数据字典不匹配；";
                                     } else{
                                         errorMsg += fieldName + " " + value + " does not match the data dictionary";
@@ -2170,9 +2167,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             if (itemNameList.contains(value)) {
                                 String finalValue = value;
                                 List<SysDictItem> collect = new ArrayList<>();
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList());
-                                } else if(LanguageEnum.EN.getValue().equals(cut)) {
+                                } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())) {
                                     collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList());
                                 }
                                 if (collect.size() != 0) {
@@ -2182,7 +2179,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         } else if (FieldTypeEnum.PULL_MORE.getValue().equals(fieldShowType)) {
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2191,7 +2188,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
                                 } else {
                                     errorMsg += fieldName + " can not be more than" + dbLength + "char;";
@@ -2203,7 +2200,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 value = value.replace("，",",");
                                 for (String valueTemp : value.split(",")) {
                                     if (!itemNameList.contains(valueTemp)) {
-                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             errorMsg += fieldName + "中的" + valueTemp + "与数据字典不匹配；";
                                         } else{
                                             errorMsg += fieldName + " " + valueTemp + " does not match the data dictionary";
@@ -2220,9 +2217,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 for (String valueTemp : value.split(",")) {
                                     if (itemNameList.contains(valueTemp)) {
                                         List<SysDictItem> collect = new ArrayList<>();
-                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList());
-                                        } else if(LanguageEnum.EN.getValue().equals(cut)) {
+                                        } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())) {
                                             collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList());
                                         }
                                         valueId += collect.get(0).getItemValue() + ",";
@@ -2236,7 +2233,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //单选日期
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2246,7 +2243,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //判断是否是单日期选择
                             value = value.replace("，",",");
                             if (StringUtils.isNotBlank(value) && value.contains(",")) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为单日期选项；";
                                 } else {
                                     errorMsg += fieldName + " is single date type;";
@@ -2255,7 +2252,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断格式是否正确
                             if (!DateUtils.isValidDate((String) value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)){
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                                     errorMsg += fieldName + "格式不正确,正确格式如:yyyy/MM/dd、yyyy-MM-dd、yyyy年MM月dd日；";
                                 }else{
                                     errorMsg += fieldName + " Incorrect format correct format is:yyyy/MM/dd、yyyy-MM-dd、yyyy年MM月dd日;";
@@ -2269,7 +2266,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //多选日期
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2278,7 +2275,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断格式是否正确
                             if (!DateUtils.isValidDate((String) value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)){
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                                     errorMsg += fieldName + "格式不正确,正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日；";
                                 }else{
                                     errorMsg += fieldName + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日;";
@@ -2292,7 +2289,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 String str = value.replace("，", ",");
                                 String[] strArr = str.split(",");
                                 if (strArr.length != 2) {
-                                    if (LanguageEnum.CN.getValue().equals(cut)) {
+                                    if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                         errorMsg += fieldName + "必须填写两个日期；";
                                     } else {
                                         errorMsg += fieldName + " must fill in the two dates;";
@@ -2305,7 +2302,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //文件
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2314,7 +2311,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
                                 } else {
                                     errorMsg += fieldName + " can not be more than" + dbLength + "char;";
@@ -2327,7 +2324,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 for (String fileName : value.split(",")) {
                                     List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null);
                                     if (nowFileList.size() == 0) {
-                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             errorMsg += fieldName + "压缩包中没有" + fileName + "文件; ";
                                         } else {
                                             errorMsg += fieldName + " " + fileName + "isn't present in the cabinet;";
@@ -2358,7 +2355,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //标准选择
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " This parameter is mandatory and cannot be empty;";
@@ -2367,7 +2364,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
                                 } else {
                                     errorMsg += fieldName + " Can not be more than" + dbLength + "char;";
@@ -2384,7 +2381,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //人员选择
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2398,7 +2395,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 List<String> userIdList = new ArrayList<>();
                                 for(int u=0 ; u<userNames.length; u++){
 //                                    if(!userNames[u].matches(regexPerson)) {
-//                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+//                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
 //                                            errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；";
 //                                        } else {
 //                                            errorMsg += fieldName + "Not in the correct format, fill in the format:name(account);";
@@ -2411,7 +2408,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         if (ObjectUtils.isNotEmpty(user)) {
                                             userIdList.add(user.getId());
                                         } else {
-                                            if(LanguageEnum.CN.getValue().equals(cut)) {
+                                            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                                 errorMsg += fieldName + "中人员" + userNames[u] + "不存在；";
                                             } else {
                                                 errorMsg += fieldName + " " + userNames[u] + "Not exist;";
@@ -2427,7 +2424,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //输入框（链接）
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                if(LanguageEnum.CN.getValue().equals(cut)) {
+                                if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                     errorMsg += fieldName + "为必填项,不能为空；";
                                 } else {
                                     errorMsg += fieldName + " is mandatory and cannot be empty;";
@@ -2440,7 +2437,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             if(StringUtils.isNotBlank(value)){
                                 for (String valueTemp : value.split(",")) {
                                     if(!valueTemp.matches(regexLink)) {
-                                        if(LanguageEnum.CN.getValue().equals(cut)) {
+                                        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                             errorMsg += valueTemp + "不是正确的链接格式，必须以http或https开头；";
                                         } else {
                                             errorMsg += valueTemp + " is not the correct format, you must start with HTTP or https";
@@ -2715,7 +2712,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             map.put("db_length", onlCgformField.getDbLength());//字段长度
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
             } else {
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
@@ -2778,7 +2775,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
 
         //第二行
         StringBuilder sbTwo = new StringBuilder();
-        if(LanguageEnum.CN.getValue().equals(cut)){
+        if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
             sbTwo.append("填写说明\n" + "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" + "2.所有带*号的字段必须填写\n");
         }else{
             sbTwo.append("Filling explanation\n"
@@ -2788,7 +2785,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         int count = 3;
         if (pullSingleList.size() != 0) {
             //单选
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String pullSingle = StringUtils.join(pullSingleList, ",") + "字段是单选属性,必须和系统中的对应字段选项相匹配\n";
                 sbTwo.append(count++ + "." + pullSingle);
             }else{
@@ -2798,7 +2795,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (textNumberList.size() != 0) {
             //文本框（数字）
-            if(LanguageEnum.CN.getValue().equals(cut)) {
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 String textNumber = StringUtils.join(textNumberList, ",") + "字段仅能填写数字，负数，小数\n";
                 sbTwo.append(count++ + "." + textNumber);
             } else {
@@ -2808,7 +2805,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (pullMoreList.size() != 0) {
             //多选
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String pullMore = StringUtils.join(pullMoreList, ",") + "字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n";
                 sbTwo.append(count++ + "." + pullMore);
             }else{
@@ -2818,7 +2815,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (dateSingleList.size() != 0) {
             //单选日期
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String dateSingle = StringUtils.join(dateSingleList, ",") + "字段为日期,必须精确到日\n";
                 sbTwo.append(count++ + "." + dateSingle);
             }else{
@@ -2828,7 +2825,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (dateMoreList.size() != 0) {
             //多选日期
-            if(LanguageEnum.CN.getValue().equals(cut)) {
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 String dateMore = StringUtils.join(dateMoreList, ",") + "字段为日期，必须精确到日，可填写多个，填写多个时采用英文或中文逗号分割\n";
                 sbTwo.append(count++ + "." + dateMore);
             } else {
@@ -2838,7 +2835,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (textStringList.size() != 0) {
             //输入框
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String textString = StringUtils.join(textStringList, ",") + "字段为文本,填写文本内容\n";
                 sbTwo.append(count++ + "." + textString);
             }else{
@@ -2848,7 +2845,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (standardList.size() != 0) {
             //标准选择
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String standard = StringUtils.join(standardList, ",") + "字段为标准号,填写多个时采用英文或中文逗号分割\n";
                 sbTwo.append(count++ + "." + standard);
             }else{
@@ -2858,7 +2855,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (fileList.size() != 0) {
             //文件
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
                 sbTwo.append(count++ + "." + file);
             }else{
@@ -2868,7 +2865,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         }
         if (treeList.size() != 0) {
             //树形结构
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 String tree = StringUtils.join(treeList, ",") + "字段为树形结构,填写的数据每层级间用反斜杠(/)划分,如A/B/C代表A层级下B,B层级下的C\n";
                 sbTwo.append(count++ + "." + tree);
             }else{
@@ -2918,7 +2915,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等)
             map.put("dict_field", onlCgformField.getDictField());
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
             } else {
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
@@ -2956,7 +2953,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 .collect(Collectors.toList());
                         if (dictItems.size() != 0) {
                             List<String> itemText = new ArrayList<>();
-                            if (LanguageEnum.CN.getValue().equals(cut)) {
+                            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                 itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
                             } else {
                                 itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList());
@@ -2967,7 +2964,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     }
                 }
             }
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 entry.setValue(StringUtils.join(dictItemsCh, ","));
             } else {
                 entry.setValue(StringUtils.join(dictItemsEn, ","));
@@ -2991,7 +2988,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             if (StringUtils.isNotBlank(value)) {
                 List<String> idList = Arrays.asList(value.split(","));
                 List<SysCategory> sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
-                if (LanguageEnum.CN.getValue().equals(cut)) {
+                if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                     List<String> nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
                     entry.setValue(StringUtils.join(nameList, ","));
                 } else {
@@ -3030,7 +3027,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 .collect(Collectors.toList());
                         if (dictItems.size() != 0) {
                             List<String> itemText = new ArrayList<>();
-                            if (LanguageEnum.CN.getValue().equals(cut)) {
+                            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                                 itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
                             } else {
                                 itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList());
@@ -3041,7 +3038,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     }
                 }
             }
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 entry.setValue(StringUtils.join(dictItemsCh, ","));
             } else {
                 entry.setValue(StringUtils.join(dictItemsEn, ","));
@@ -3065,7 +3062,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             if (StringUtils.isNotBlank(value)) {
                 List<String> idList = Arrays.asList(value.split(","));
                 List<SysCategory> sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList());
-                if (LanguageEnum.CN.getValue().equals(cut)) {
+                if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                     List<String> nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList());
                     entry.setValue(StringUtils.join(nameList, ","));
                 } else {
@@ -3108,7 +3105,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             map.put("db_length", onlCgformField.getDbLength());//字段长度
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
             } else {
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
@@ -3153,7 +3150,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码
             map.put("db_field_name", onlCgformField.getDbFieldName());//字段
             map.put("db_length", onlCgformField.getDbLength());//字段长度
-            if (LanguageEnum.CN.getValue().equals(cut)) {
+            if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) {
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
             } else {
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
@@ -3767,7 +3764,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         List<LawsTag> fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue()
                 .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList());
        List<String> fieldForExport = new ArrayList<>();
-        if (LanguageEnum.EN.getValue().equals(cut)){
+        if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())){
             fieldForExport = fieldListSelect.stream().map(LawsTag::getDbFieldEnName).collect(Collectors.toList());
         } else {
             fieldForExport = fieldListSelect.stream().map(LawsTag::getDbFieldTxt).collect(Collectors.toList());
@@ -3862,7 +3859,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             String dbFieldName = onlCgformField.getDbFieldName();
             map.put("db_field_name", dbFieldName);
 
-            if(LanguageEnum.CN.getValue().equals(cut)){
+            if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
                 map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
             }else{
                 map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名

From 9be2cbaf7eb44ae27b35515ad495da6f8f6d896f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 10 Nov 2023 18:09:45 +0800
Subject: [PATCH 3/3] fix: 78304
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

企标--导入--稽查内容的整改部门带出回显
---
 .../service/impl/LawsCommonServiceImpl.java   |  4 ++-
 .../modules/laws/common/util/ImportUtil.java  | 25 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index b6348a8d..bc12f06e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -644,7 +644,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
         }
         // 企标授权部门处理
         if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) {
-            esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString());
+            if (parameterMap.get(FieldCommon.AUTH_DEPT) != null) {
+                esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString());
+            }
         }
 
         return MessageUtils.getMessage(ResultCommon.OK);
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 2eeceeef..5494711b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -437,17 +437,6 @@ public class ImportUtil {
                     }
                 }
 
-                // 企标稽查内容文件导入
-                if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
-                    if (!this.inspectContentFileValid(cellValue, fileMap)) {
-                        log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
-                        errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
-                    } else {
-                        // 转为List
-                        // 将转好的值加入Map
-                        parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
-                    }
-                }
                 // 树形单选
                 if (FieldShowTypeEnum.TREE_STRUCTURE_SINGLE_SELECT.getValue().equals(tag.getFieldShowType())) {
                     // 根据tag找到dictCode
@@ -463,6 +452,19 @@ public class ImportUtil {
 
                 // 将转好的值加入Map
                 parameterMap.put(tag.getDbFieldName(), cellValue);
+
+                // 企标稽查内容文件导入
+                if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
+                    if (!this.inspectContentFileValid(cellValue, fileMap)) {
+                        cellValue = null;
+                        log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
+                        errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
+                    } else {
+                        // 转为List
+                        // 将转好的值加入Map
+                        parameterMap.put(tag.getDbFieldName(), this.convertInspectContentFile(cellValue, fileMap));
+                    }
+                }
             }
             // 判断实施日期是否大于发布日期15天
             if (releaseDate != null && implementationDate != null) {
@@ -837,6 +839,7 @@ public class ImportUtil {
                 // 获取第四行前两个单元格的内容
                 String cellContent1 = getCellContent(row.getCell(0));
                 String cellContent2 = getCellContent(row.getCell(1));
+                String cellContent3 = getCellContent(row.getCell(2));
                 // 执行valid方法进行校验
                 if (!valid(cellContent1, cellContent2)) {
                     return false;