From e2339db8255e350596310ab27bebe5b4a014d5aa Mon Sep 17 00:00:00 2001
From: lead <lead@local>
Date: 星期二, 03 十一月 2026 11:04:36 +0800
Subject: [PATCH] feat(safety): 从长辉分支移植安全生产模块
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
index 34b1934..d13e246 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
@@ -61,7 +61,11 @@
@Operation(summary = "鏌ョ湅鑳借�楄褰�")
@PreAuthorize("@ss.hasPermission('energy:record:query')")
public CommonResult<EnergyRecordRespVO> get(@RequestParam("id") Long id) {
- return success(BeanUtils.toBean(energyRecordService.get(id), EnergyRecordRespVO.class));
+ var record = energyRecordService.get(id);
+ if (record == null) {
+ return success(null);
+ }
+ return success(BeanUtils.toBean(record, EnergyRecordRespVO.class));
}
@GetMapping("/page")
--
Gitblit v1.9.3