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 e73139d8a..4eb58fced 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
@@ -1925,7 +1925,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         WorkerType workerType = workerTypeMapper.selectById(entityMap.get("workerTypeId"));
         List<WorkerSafeEducation> workerSafeEducations = workerSafeEducationMapper.selectList(Wrappers.<WorkerSafeEducation>lambdaQuery()
                 .eq(WorkerSafeEducation::getProjectSn, projectSn)
-                .eq(WorkerSafeEducation::getEduType, 1).last(Cts.IGNORE_DATA_SCOPE_CONDITION)
+                .eq(WorkerSafeEducation::getEduType, 1).apply(Cts.IGNORE_DATA_SCOPE_CONDITION_APPLY)
                 .orderByDesc(WorkerSafeEducation::getAddTime));
         if (workerSafeEducations == null || workerSafeEducations.size() == 0) {
             throw new OpenAlertException("该人员未参加过入场安全教育培训!");
diff --git a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
index fadf4ea68..4e80911e6 100644
--- a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
+++ b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
@@ -353,8 +353,10 @@ public class ExcelUtils {
             for (String s : map.keySet()) {
                 placeholderMap.put("${" + s + "}", map.get(s));
             }
-            placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime());
-            placeholderMap.put("${score}", workerSafeEducationWorker.getScore());
+            if (workerSafeEducationWorker != null) {
+                placeholderMap.put("${studyTime}", workerSafeEducationWorker.getStudyTime());
+                placeholderMap.put("${score}", workerSafeEducationWorker.getScore());
+            }
             placeholderMap.put("${workerTypeName}", workerType.getTypeName());
             // 替换占位符
             for (Row row : sheet) {