diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index ff1151411..5b0026d98 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -196,13 +196,15 @@ public class WorkerInfoServiceImpl extends ServiceImpl workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList()); - List workerCertificate = workerCertificateService.list(Wrappers.lambdaQuery() - .in(WorkerCertificate::getWorkerId, workerIds) - .eq(WorkerCertificate::getCertificateType, 45)); - for (WorkerInfo workerInfo : list) { - List collect = workerCertificate.stream().filter(w -> w.getWorkerId().toString().equals(workerInfo.getId().toString())).collect(Collectors.toList()); - workerInfo.setFireCertificate(collect.size() > 0 ? collect.get(0).getCertificateNumber() : ""); + if (list.size() > 0) { + List workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList()); + List workerCertificate = workerCertificateService.list(Wrappers.lambdaQuery() + .in(WorkerCertificate::getWorkerId, workerIds) + .eq(WorkerCertificate::getCertificateType, 118)); + for (WorkerInfo workerInfo : list) { + List collect = workerCertificate.stream().filter(w -> w.getWorkerId().toString().equals(workerInfo.getId().toString())).collect(Collectors.toList()); + workerInfo.setFireCertificate(collect.size() > 0 ? collect.get(0).getCertificateNumber() : ""); + } } return page.setRecords(list); }