From 58848940fdb826ce65468fde7020a85be5f85dca Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 25 Nov 2025 18:07:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=A8=A1=E7=89=88=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2=E4=BF=A1?= =?UTF-8?q?=E6=81=AFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/worker/service/impl/WorkerInfoServiceImpl.java | 2 +- src/main/java/com/zhgd/xmgl/util/ExcelUtils.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 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 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 workerSafeEducations = workerSafeEducationMapper.selectList(Wrappers.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) {