From 8485affcb0d4de05059d80cb1e844d6b18291654 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期五, 16 五月 2025 14:35:49 +0800 Subject: [PATCH] 修正 --- src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java index aedee64..b106467 100644 --- a/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java +++ b/src/main/java/com/gkhy/labRiskManage/domain/riskReport/service/impl/ReportRiskAssessInfoServiceImpl.java @@ -227,9 +227,12 @@ if (!ObjectUtils.isEmpty(assessPlanByExperimentId)){ for (AssessPlanQueryDTO assessPlan : assessPlanByExperimentId) { - if (reportQueryDTO.getEvaluateTime().isBefore(assessPlan.getEvaluateTime())){ - reportQueryDTO.setEvaluateTime(assessPlan.getEvaluateTime()); + if (assessPlan.getEvaluateTime() != null){ + if (reportQueryDTO.getEvaluateTime().isBefore(assessPlan.getEvaluateTime())){ + reportQueryDTO.setEvaluateTime(assessPlan.getEvaluateTime()); + } } + } } -- Gitblit v1.9.2