Selaa lähdekoodia

PC新增设备删除,岗位删除,职能删除2

chenshibin 4 vuotta sitten
vanhempi
commit
3c977bc54a
1 muutettua tiedostoa jossa 5 lisäystä ja 2 poistoa
  1. 5 2
      Controller/PctestController.py

+ 5 - 2
Controller/PctestController.py

@@ -191,7 +191,7 @@ class PcTest(View):
 
 
         function_list = PctestfunctionModel.objects.filter(id__in=functions.split(','))
         function_list = PctestfunctionModel.objects.filter(id__in=functions.split(','))
         # 判断设备与此职能是否有关联,避免重复添加
         # 判断设备与此职能是否有关联,避免重复添加
-        PctestModel.objects.filter(device_id=device_qs[0].id, function__in=function_list).delete()
+        PctestModel.objects.filter(device_id=device_qs[0].id).delete()
         for fun in function_list:
         for fun in function_list:
             PctestModel.objects.create(device_id=device_qs[0].id, function_id=fun.id)
             PctestModel.objects.create(device_id=device_qs[0].id, function_id=fun.id)
         return response.json(0)
         return response.json(0)
@@ -224,8 +224,10 @@ class PcTest(View):
         id = request_dict.get('id', None)
         id = request_dict.get('id', None)
         device_qs = PctestdeviceModel.objects.filter(id=id)
         device_qs = PctestdeviceModel.objects.filter(id=id)
         if device_qs.exists:
         if device_qs.exists:
-            device_qs.delete()
+            PctestjobdeviceModel.objects.filter(device__in=device_qs).delete()
             PctestModel.objects.filter(device__in=device_qs).delete()
             PctestModel.objects.filter(device__in=device_qs).delete()
+            device_qs.delete()
+
 
 
         return response.json(0)
         return response.json(0)
 
 
@@ -253,6 +255,7 @@ class PcTest(View):
         function_qs = PctestfunctionModel.objects.filter(id=id)
         function_qs = PctestfunctionModel.objects.filter(id=id)
 
 
         if function_qs.exists:
         if function_qs.exists:
+            PctestModel.objects.filter(function__in=function_qs).delete()
             function_qs.delete()
             function_qs.delete()
         return response.json(0)
         return response.json(0)