From 5529e90ce92e47777eca6ee3ae9a379608033a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B8=85?= <2944435683> Date: Thu, 9 Apr 2026 16:39:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B4=A0=E6=9D=90=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=9F=A5=E8=AF=A2=E6=9C=AC=E9=A1=B9=E7=9B=AE=E5=85=A8?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/assets/getMaterialData.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/assets/getMaterialData.ts b/src/routes/assets/getMaterialData.ts index 1e5e3ba..8c35c07 100644 --- a/src/routes/assets/getMaterialData.ts +++ b/src/routes/assets/getMaterialData.ts @@ -18,8 +18,7 @@ export default router.post( .db("o_assets") .leftJoin("o_image", "o_assets.id", "=", "o_image.assetsId") .where("o_assets.type", "clip") - .andWhere("projectId", projectId) - .andWhere("scriptId", scriptId) + .andWhere("o_assets.projectId", projectId) .select("*"); const data = await Promise.all( list.map(async (item) => ({ @@ -40,7 +39,7 @@ export default router.post( .db("o_videoTrack") .where("o_videoTrack.scriptId", scriptId) .andWhere("o_videoTrack.projectId", projectId) - .select("o_videoTrack.id as trackId"); + .select("o_videoTrack.id as trackId","o_videoTrack.videoId"); // 按轨道分组处理视频 const video = await Promise.all( trackRows.map(async (track) => { @@ -54,6 +53,7 @@ export default router.post( ); return { id: track.trackId, + videoId: track.videoId, video: videoList, }; }),