From bb206e9e0c05e7d3d5d989ecb6cd40cd293b6795 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 16 十月 2026 14:34:09 +0800
Subject: [PATCH] 修复核查计划明细导出异常：未录入记录时友好提示而非报错500
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordContrastServiceImpl.java | 3 +++
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordContrastServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordContrastServiceImpl.java
index 5884953..10706a8 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordContrastServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordContrastServiceImpl.java
@@ -148,6 +148,9 @@
public void exportReviewExamineRecordContrast(Integer planDetailsId, HttpServletResponse response) {
// 鏌ヨ瀵规瘮璁板綍
DeviceExamineRecordContrastDto deviceExamineRecordContrast = baseMapper.selectExamineRecordContrastDto(planDetailsId);
+ if (deviceExamineRecordContrast == null) {
+ throw new ErrorException("璇ヨ鍒掓槑缁嗘殏鏃犳牳鏌ユ瘮瀵硅褰曪紝璇峰厛褰曞叆鍚庡啀瀵煎嚭");
+ }
// 鏌ヨ瀵规瘮璁板綍璇︽儏
List<DeviceExamineRecordContrastDetails> deviceExamineRecordContrastDetailList = deviceExamineRecordContrastDetailsService.list(Wrappers.<DeviceExamineRecordContrastDetails>lambdaQuery().eq(DeviceExamineRecordContrastDetails::getRecordContrastId, deviceExamineRecordContrast.getRecordContrastId()));
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java
index cdb33d0..d5fea12 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExamineRecordServiceImpl.java
@@ -199,6 +199,9 @@
public void exportReviewExamineRecordDetail(Integer planDetailsId, HttpServletResponse response) {
// 鏌ヨ澶嶆牳鏍告煡璁板綍
DeviceExamineRecordDto deviceExamineRecordDto = baseMapper.selectReviewExamineRecordDto(planDetailsId);
+ if (deviceExamineRecordDto == null) {
+ throw new ErrorException("璇ヨ鍒掓槑缁嗘殏鏃犳牳鏌ヨ褰曪紝璇峰厛褰曞叆鍚庡啀瀵煎嚭");
+ }
// 鏌ヨ澶嶆牳鏍告煡璁板綍璇︽儏
List<DeviceExamineRecordDetail> deviceExamineRecordDetailList = deviceExamineRecordDetailService.list(Wrappers.<DeviceExamineRecordDetail>lambdaQuery().eq(DeviceExamineRecordDetail::getRecordId, deviceExamineRecordDto.getRecordId()));
--
Gitblit v1.9.3