fix: 支持删除图片异常批次

2026-07-15 17:52:29 +08:00
parent ff0a93677a
commit 755e210951
9 changed files with 531 additions and 51 deletions
@@ -131,7 +131,14 @@ class AssetViewSet(TeamScopedViewSetMixin, ModelViewSet):
                Q(origin_task__task_type="free_video", origin_task__is_deleted=True)
                | Q(origin_task__conversation__is_deleted=True)
            )
-            return trash_qs.exclude(owned_by_deleted_free_creation).order_by("-updated_at")
+            # 图片异常批次由任务批次垃圾桶统一恢复/彻底删除；其成功图不能再作为独立资产
+            # 重复出现在这里。全成功图片批次不会软删任务，仍维持既有的逐图资产垃圾桶行为。
+            owned_by_deleted_image_exception_batch = Q(
+                origin_task__project__isnull=True,
+                origin_task__task_type__in=["person_image", "product_image"],
+                origin_task__is_deleted=True,
+            )
+            return trash_qs.exclude(owned_by_deleted_free_creation | owned_by_deleted_image_exception_batch).order_by("-updated_at")
        qs = qs.filter(is_deleted=False, purged_at__isnull=True)  # 软删资产不出现在资产库
        p = self.request.query_params
        tab = p.get("tab")