From 1f7139d5197b280aef81ba07ce86c4bf26685663 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 15 Aug 2024 11:09:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StandardInterpretFlowServiceImpl.java     |  2 +-
 .../service/impl/FileSplitItemsEOServiceImpl.java  | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
index 927bd3f1..c53169ce 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java
@@ -1289,7 +1289,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                                      List<ProcessStandardInterpretClauseSublist> clauseSublistList) {
         List<String> errorList = new ArrayList<>();
         String itemNum = data.getItemNum();
-        String itemTitle = data.getItemTitle();
+        String itemTitle = Objects.isNull(data.getItemTitle()) ? "" : data.getItemTitle();
         boolean exist = true;
         if (StringUtils.isBlank(itemNum)){
             errorList.add("标准编号/条款号不能为空！");
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 d974d31c..f4e54b4a 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
@@ -1906,6 +1906,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     resultMsg = "Only one Excel file can be imported in the compressed package root directory";
                 }
                 return Result.error(1, resultMsg);
+            }else {
+                // 校验名称
+                File file1 = excelfilelist.get(0);
+                String name = file1.getName().substring(0, file1.getName().lastIndexOf("."));
+                if(!"条款导入模板".equals(name)){
+                    //删除原上传文件
+                    FileUnZip.deleteDir(saveDirectory);
+                    if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
+                        resultMsg = "excel名称不正确，应为：条款导入模板";
+                    }else{
+                        resultMsg = "excel name is incorrect, should be: 条款导入模板";
+                    }
+                    return Result.error(1, resultMsg);
+                }
             }
             File excelfile = excelfilelist.get(0);