From e5e5cf3c2b8a3f991dea2e5769f553ff743a5320 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 17 May 2024 19:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=A1=A8=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WorkerInfoServiceImpl.java      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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);