|
@@ -1014,12 +1014,10 @@ public class InformationWriteQueryController extends BladeController {
|
|
List<InformationQuery> result = this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getId, Arrays.asList(ids.split(","))));
|
|
List<InformationQuery> result = this.informationQueryService.list(Wrappers.<InformationQuery>lambdaQuery().in(InformationQuery::getId, Arrays.asList(ids.split(","))));
|
|
if (result != null && result.size() > 0) {
|
|
if (result != null && result.size() > 0) {
|
|
//删除掉pdfUrl和eVisaPdfUrl都为空的数据
|
|
//删除掉pdfUrl和eVisaPdfUrl都为空的数据
|
|
-// result.removeIf(query -> StringUtils.isEmpty(query.getPdfUrl()) && StringUtils.isEmpty(query.getPdfUrl()));
|
|
|
|
- result.removeIf(query -> StringUtils.isEmpty(query.getPdfUrl()) || StringUtils.isEmpty(query.getEVisaPdfUrl()));
|
|
|
|
|
|
+ result.removeIf(query -> StringUtils.isEmpty(query.getPdfUrl()) && StringUtils.isEmpty(query.getPdfUrl()));
|
|
if (result.size() > 0) {
|
|
if (result.size() > 0) {
|
|
List<String> urls = new ArrayList<>();
|
|
List<String> urls = new ArrayList<>();
|
|
-// result.forEach(query -> urls.add(StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() + "@@@" + query.getName() + "-" + query.getId() : query.getPdfUrl() + "@@@" + query.getName() + "-" + query.getId()));
|
|
|
|
- result.forEach(query -> urls.add(StringUtils.isNotEmpty(query.getNodePdfUrl()) ? query.getNodePdfUrl() + "@@@" + query.getName() + "-" + query.getId() : query.getEVisaPdfUrl() + "@@@" + query.getName() + "-" + query.getId()));
|
|
|
|
|
|
+ result.forEach(query -> urls.add(StringUtils.isNotEmpty(query.getEVisaPdfUrl()) ? query.getEVisaPdfUrl() + "@@@" + query.getName() + "-" + query.getId() : query.getPdfUrl() + "@@@" + query.getName() + "-" + query.getId()));
|
|
//删除空数据
|
|
//删除空数据
|
|
urls.removeIf(StringUtils::isEmpty);
|
|
urls.removeIf(StringUtils::isEmpty);
|
|
//打包下载
|
|
//打包下载
|