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