Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-12 0f5b969ddd52ca43ef003867b5a6749d74b7d71d

 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);
    }

    /**