From f0f977ebaa8f5a021010927a0fccefa34c12ce86 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 3 Nov 2022 11:28:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=A1=AB=E5=86=99=E4=BA=BA=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5-bug62116?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 5e8efa641..ddc059247 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -2645,8 +2645,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		if(!saveDirectory.isDirectory()){
 			saveDirectory.mkdir();
 		}
-		FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +File.separator+ file.getOriginalFilename()));
 		try{
+			FileUtils.copyInputStreamToFile(file.getInputStream(), new File(path +File.separator+ file.getOriginalFilename()));
 			//解压缩
 			String zipEntryName = FileUnZip.unZipFiles2(path +File.separator+ file.getOriginalFilename(), path);
 			// 数据相关处理,
@@ -2715,6 +2715,15 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						//删除原上传文件
 						FileUnZip.deleteDir(saveDirectory);
 						return message;
+					} catch (NullPointerException e) {
+						//删除原上传文件
+						FileUnZip.deleteDir(saveDirectory);
+						if(CutEnum.CN.getValue().equals(cut)){
+							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);