From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
index b195861..a97621b 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
@@ -43,9 +43,7 @@
@Override
public ArdRouteFolder selectArdRouteFolderById(String id) {
ArdRouteFolder ardRouteFolder = ardRouteFolderMapper.selectArdRouteFolderById(id);
- ArdRouteInformation ardRouteInformation = new ArdRouteInformation();
- ardRouteInformation.setFolderId(id);
- ardRouteFolder.setArdRouteInformationLs(ardRouteInformationMapper.selectArdRouteInformationList(ardRouteInformation));
+ ardRouteFolder.setArdRouteInformationLs(ardRouteInformationMapper.selectArdRouteInformationByFolderId(id));
return ardRouteFolder;
}
@@ -60,18 +58,9 @@
public List<ArdRouteFolder> selectArdRouteFolderList(ArdRouteFolder ardRouteFolder) {
List<ArdRouteFolder> list = ardRouteFolderMapper.selectArdRouteFolderList(ardRouteFolder);
for (ArdRouteFolder routeFolder : list) {
- routeFolder.setArdRouteInformationLs(getArdRouteInformation(routeFolder.getId()));
+ routeFolder.setArdRouteInformationLs(ardRouteInformationMapper.selectArdRouteInformationByFolderId(routeFolder.getId()));
}
return list;
- }
-
- /**
- * 查询文件列表
- */
- private List<ArdRouteInformation> getArdRouteInformation(String folderId) {
- ArdRouteInformation ardRouteInformation = new ArdRouteInformation();
- ardRouteInformation.setFolderId(folderId);
- return ardRouteInformationMapper.selectArdRouteInformationList(ardRouteInformation);
}
/**
--
Gitblit v1.9.3