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

---
 .../service/impl/FileSplitItemsEOServiceImpl.java     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 fde1ebd1..cf34705f 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
@@ -1621,7 +1621,16 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         return message;
-                    } catch (Exception e) {
+                    } catch (NullPointerException e){
+                        //删除原上传文件
+                        FileUnZip.deleteDir(saveDirectory);
+                        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";
+                        }
+                        return Result.error(1, resultMsg);
+                    }catch (Exception e) {
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         return Result.error(e.getMessage());