Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

This commit is contained in:
zyx.net
2023-09-26 16:53:57 +08:00
@@ -12229,8 +12229,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
List<String> fileIdList = new ArrayList<>();
List<String> collect3 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
List<String> collect4 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
List<String> collect3 = projectLawsInventoryEOList.stream()
.filter(e->StringUtils.isNotBlank(e.getDesignDeliverableTemplate())).map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList());
List<String> collect4 = projectLawsInventoryEOList.stream()
.filter(e->StringUtils.isNotBlank(e.getVerifyDeliverableTemplate())).map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList());
if(ObjectUtils.isNotEmpty(collect3)){
fileIdList.addAll(collect3);
}