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> getCnExportSheetsList(List paramsInfoEOList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEOList)) { - throw new JeroBootException("没有可导出的数据"); + throw new JeroBootException("没有可导出的数据!"); } List fileTemplateList = new ArrayList<>(); @@ -571,7 +582,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl> getEnExportSheetsList(List paramsInfoEnExportList, String fileNowPath, String paramsTemplateId) throws IOException { if (CollectionUtil.isEmpty(paramsInfoEnExportList)) { - throw new JeroBootException("没有可导出的数据"); + throw new JeroBootException("No data available for export!"); } List fileTemplateList = new ArrayList<>(); @@ -1373,6 +1384,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl 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 -> {