From 62cd9d30a8995f11be78aeb49815e7f7d4a11506 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 13 十月 2026 17:45:18 +0800
Subject: [PATCH] 设备模块后端调整：档案修订保存时自动同步生成本年度校准、核查、保养计划明细（校准计划时间取有效期前一个月，核查、保养取下次日期前一个月）；设备新增保养、核查日期与周期字段；设备树查询改为全部/设备/计量器具分类；新增检测员角色人员查询接口；导入模板移除所属部门列
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java
index 4a0b914..e45aaed 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceStateServiceImpl.java
@@ -73,7 +73,7 @@
Laboratory laboratory = laboratoryMapper.selectOne(Wrappers.<Laboratory>lambdaQuery()
.eq(Laboratory::getLaboratoryNumber, largeCategory)
.select(Laboratory::getLaboratoryName));
- laboratoryName = laboratory.getLaboratoryName();
+ laboratoryName = laboratory != null ? laboratory.getLaboratoryName() : "";
} else {
laboratoryName = "";
}
--
Gitblit v1.9.3