diff --git a/apps/wpm/views.py b/apps/wpm/views.py index b6de1812..62aa98f4 100644 --- a/apps/wpm/views.py +++ b/apps/wpm/views.py @@ -192,6 +192,7 @@ class MlogViewSet(CustomModelViewSet): # delete_auditlog(instance, instance.id) if instance.ticket: instance.ticket.delete() + Ftest.objects.filter(mlogbw_ftest__mlogb__mlog=instance).delete() instance.delete() @transaction.atomic @@ -499,12 +500,8 @@ class MlogbInViewSet(CreateModelMixin, UpdateModelMixin, DestroyModelMixin, Cust query_dict["batch__contains"] = ins.batch qs = Mlogb.objects.filter(**query_dict) | qs # 需要删除子集ftest记录 - mlogbw_qs = Mlogbw.objects.filter(mlogb__in=qs) - # 需用list 不然qs.delete 这个qs会变空 - ftestIds = list(mlogbw_qs.values_list("ftest__id", flat=True)) + Ftest.objects.filter(mlogbw_ftest__mlogb__in=qs).delete() qs.delete() - Ftest.objects.filter(id__in=ftestIds).delete() - instance.delete() @transaction.atomic