From 245506a54609fbcf854f863fcc6c33f99f017dfe Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Mon, 27 Jun 2022 13:45: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?bug54766?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsInfoEOServiceImpl.java | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index b360a0c73..643ba3d67 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -398,7 +398,11 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			workbook.write(os);
 		} catch (IOException e) {
 			log.error("发生异常，异常信息为："+e.getMessage(), e);
-			throw new JeroBootException("下载文件失败，请重试");
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("下载文件失败，请重试！");
+			} else {
+				throw new JeroBootException("Failed to download file, please try again!");
+			}
 		}finally {
 			IOUtils.closeQuietly(os);
 			try {
@@ -472,9 +476,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			os.flush();
 			os.close(); // 后开先关
 			fis.close(); // 先开后关
+		} catch (JeroBootException e) {
+			log.error(e.getMessage(), e);
+			throw new JeroBootException(e.getMessage());
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
-			throw new JeroBootException("下载文件失败，请重试");
+			if (CutEnum.CN.getValue().equals(cut)) {
+				throw new JeroBootException("下载文件失败，请重试！");
+			} else {
+				throw new JeroBootException("Failed to download file, please try again!");
+			}
 		} finally {
 			IOUtils.closeQuietly(os);
 			IOUtils.closeQuietly(excelOS);
@@ -484,7 +495,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 	private List<Map<String, Object>> getCnExportSheetsList(List<ParamsInfoEO> paramsInfoEOList, String fileNowPath, String paramsTemplateId) throws IOException {
 
 		if (CollectionUtil.isEmpty(paramsInfoEOList)) {
-			throw new JeroBootException("没有可导出的数据");
+			throw new JeroBootException("没有可导出的数据！");
 		}
 
 		List<OSSFile> fileTemplateList = new ArrayList<>();
@@ -571,7 +582,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 	private List<Map<String, Object>> getEnExportSheetsList(List<ParamsInfoEnExport> paramsInfoEnExportList, String fileNowPath, String paramsTemplateId) throws IOException {
 
 		if (CollectionUtil.isEmpty(paramsInfoEnExportList)) {
-			throw new JeroBootException("没有可导出的数据");
+			throw new JeroBootException("No data available for export!");
 		}
 
 		List<OSSFile> fileTemplateList = new ArrayList<>();
@@ -1373,6 +1384,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			}
 		}
 		List<CertCategoryParamsInfoCnImport> listAfterDistinct = listAll.stream()
+				.filter(e->StringUtils.isNotEmpty(e.getNioNumber()) && StringUtils.isNotEmpty(e.getCertCategory()))
 				.collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
 						new TreeSet<>(Comparator.comparing(o -> o.getNioNumber() + ";" + o.getCertCategory()))), ArrayList::new));
 		listAfterDistinct.forEach(item -> {