From 0979d4fd4dae202af99accc2239ce645a1a2a1d1 Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Thu, 8 Oct 2026 00:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E4=BD=93=E8=B5=84=E6=BA=90=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=9C=80=E6=96=B0=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=85=88?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E4=BC=A0=E8=B4=B4=E5=9B=BE/=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E5=90=8E=E7=AB=8B=E5=8D=B3=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit get_resources_by_body 与 get_all_resources_grouped_by_body 都按 created_at DESC, id DESC 排序:texture/model 是追加语义,旧行不会删除, 消费方一律取第一条或第一条匹配项,原来按时间正序导致新上传的排在最后取不到。 created_at 用 func.now()(事务时间戳),同批种子数据完全相同,需要 id 兜底。 --- backend/app/services/resource_service.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/app/services/resource_service.py b/backend/app/services/resource_service.py index a60602f..cf4a310 100644 --- a/backend/app/services/resource_service.py +++ b/backend/app/services/resource_service.py @@ -40,8 +40,11 @@ class ResourceService: statement = select(Resource).where(Resource.body_id == body_id) if resource_type: statement = statement.where(Resource.resource_type == resource_type) + # 最新上传优先:texture/model 是追加语义,重传后旧行仍在, + # 消费方一律取第一条或第一条匹配项,必须让新资源排在最前面。 + # created_at 用的是 func.now()(事务时间戳),同批插入的行完全相同,用 id 兜底定序。 result = await active_session.execute( - statement.order_by(Resource.created_at) + statement.order_by(Resource.created_at.desc(), Resource.id.desc()) ) return list(result.scalars().all()) @@ -56,8 +59,10 @@ class ResourceService: session: Optional[AsyncSession] = None, ) -> Dict[str, List[Resource]]: async def query(active_session: AsyncSession) -> Dict[str, List[Resource]]: + # 与 get_resources_by_body 保持一致的“最新优先”, + # 否则管理端弹窗先用列表数据渲染、再用详情接口刷新时顺序会跳变。 statement = select(Resource).order_by( - Resource.body_id, Resource.created_at + Resource.body_id, Resource.created_at.desc(), Resource.id.desc() ) if body_ids: statement = statement.where(Resource.body_id.in_(body_ids))