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 5b0026d98..72da263cf 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
@@ -197,13 +197,15 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             list = workerInfoMapper.selectWorkerInfoList(page, map);
         }
         if (list.size() > 0) {
-            List<Long> workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList());
-            List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
-                    .in(WorkerCertificate::getWorkerId, workerIds)
-                    .eq(WorkerCertificate::getCertificateType, 118));
-            for (WorkerInfo workerInfo : list) {
-                List<WorkerCertificate> 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(MapUtils.getInteger(map, "certificateType") != null) {
+                List<Long> workerIds = list.stream().map(l -> l.getId()).collect(Collectors.toList());
+                List<WorkerCertificate> workerCertificate = workerCertificateService.list(Wrappers.<WorkerCertificate>lambdaQuery()
+                        .in(WorkerCertificate::getWorkerId, workerIds)
+                        .eq(WorkerCertificate::getCertificateType, MapUtils.getInteger(map, "certificateType")));
+                for (WorkerInfo workerInfo : list) {
+                    List<WorkerCertificate> 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);