From bf616f97b4d1a96e0ee89c52178a88e044e52a1d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 九月 2024 10:40:24 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
index 4a440a2..9043935 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java
@@ -80,7 +80,14 @@
@PreAuthorize("hasAuthority('manager:agv:list')")
@GetMapping("/agv/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(agvService.getById(id));
+ Agv agv = agvService.getById(id);
+ if (null != agv) {
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ if (null != agvDetail) {
+ agv.setAgvDetail(agvDetail);
+ }
+ }
+ return R.ok().add(agv);
}
@PreAuthorize("hasAuthority('manager:agv:save')")
--
Gitblit v1.9.1