认证-参数项收集-填写人导入-bug62116

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);