From ead838a214c10f8d710780485d18d54500b8cf88 Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Tue, 20 Jan 2026 18:03:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceledger/DeviceLedgerController.java  | 19 ++++++++++++++++++-
 .../deviceledger/DeviceLedgerServiceImpl.java |  2 ++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java
index 02486eab53..104a6ad691 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java
@@ -86,7 +86,24 @@ public class DeviceLedgerController {
     @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')")
     public CommonResult<DeviceLedgerRespVO> getDeviceLedger(@RequestParam("id") Long id) {
         DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(id);
-        return success(BeanUtils.toBean(deviceLedger, DeviceLedgerRespVO.class));
+
+        DeviceLedgerRespVO respVO = BeanUtils.toBean(deviceLedger, DeviceLedgerRespVO.class);
+
+        if (StringUtils.isNotBlank(respVO.getDeviceManager())) {
+            String[] userIds = respVO.getDeviceManager().split(",");
+            StringBuilder names = new StringBuilder();
+
+            for (int i = 0; i < userIds.length; i++) {
+                AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(userIds[i].trim()));
+                if (user != null) {
+                    if (i > 0) names.append(", ");
+                    names.append("(").append(user.getUsername()).append(")").append(user.getNickname());
+                }
+            }
+            respVO.setDeviceManagerName(names.toString());
+        }
+
+        return success(respVO);
     }
 
 
diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java
index db1e3b3c43..b8042213bd 100644
--- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java
+++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java
@@ -140,6 +140,8 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
     public DeviceLedgerDO getDeviceLedger(Long id) {
 
         DeviceLedgerDO deviceLedgerDO = deviceLedgerMapper.selectById(id);
+
+
         Map<String,List<DvRepairLineDO>> dvRepairDOMap=new HashMap<>();
 
         //TODO 待修改迁移