From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index 84c46e9..b98ff53 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -194,8 +194,13 @@
@Override
public DeviceRepairDto detailById(Long id) {
-
- return deviceRepairMapper.detailById(id);
+ DeviceRepairDto deviceRepairDto = deviceRepairMapper.detailById(id);
+ LambdaQueryWrapper<CommonFile> queryWrapper = new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, deviceRepairDto.getId()) // 鍏宠仈璁板綍ID
+ .eq(CommonFile::getType, FileNameType.DeviceRepair.getValue()); // 鏂囦欢绫诲瀷
+ List<CommonFile> commonFiles = commonFileMapper.selectList(queryWrapper);
+ deviceRepairDto.setFileList(commonFiles);
+ return deviceRepairDto;
}
}
--
Gitblit v1.9.3