From b80d503bfde9c1aa1d3219c1673bfee2ae01338d Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 29 Oct 2024 09:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=A8=E5=9E=92=E5=AE=89=E5=85=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=B0=83=E6=95=B4bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WorkerSafeEducationWorkerServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java index 57eb2bb73..677a04de7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerSafeEducationWorkerServiceImpl.java @@ -18,13 +18,11 @@ import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducation; import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; -import com.zhgd.xmgl.modules.worker.mapper.WorkerSafeEducationMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerSafeEducationWorkerMapper; import com.zhgd.xmgl.modules.worker.service.ITeamInfoService; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.worker.service.IWorkerSafeEducationService; import com.zhgd.xmgl.modules.worker.service.IWorkerSafeEducationWorkerService; -import com.zhgd.xmgl.util.MapUtil; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -150,7 +148,7 @@ public class WorkerSafeEducationWorkerServiceImpl extends ServiceImpl Objects.equals(l.getIsQualified(), 1)).count()); - resultMap.put("educationNewRecord", list.get(0).getStudyTime()); + resultMap.put("educationNewRecord", CollUtil.isNotEmpty(list) ? list.get(0).getStudyTime() : null); return resultMap; }