瀏覽代碼

Merge branch 'ming' into test

zhangdongming 3 年之前
父節點
當前提交
f8d7a10900
共有 1 個文件被更改,包括 9 次插入7 次删除
  1. 9 7
      Controller/SensorGateway/GatewayFamilyMemberController.py

+ 9 - 7
Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -74,18 +74,20 @@ class GatewayFamilyMemberView(View):
         @param response:
         @return:
         """
-        join_id = request_dict.get('joinId', None)
-        if not join_id:
+        join_ids = request_dict.get('joinIds', None)
+        family_id = request_dict.get('familyId', None)
+        if not join_ids:
             return response.json()
-        family_member_join_qs = FamilyMemberJoin.objects.filter(id=join_id)
-        if not family_member_join_qs.exists():
-            return response.json(173)
-        is_owner = EquipmentFamilyView.get_family_owner(app_user_id, family_member_join_qs.first().family_id)
+        is_owner = EquipmentFamilyView.get_family_owner(app_user_id, family_id)
         if not is_owner:
             return response.json(404)
         try:
             with transaction.atomic():
-                family_member_join_qs.delete()
+                items = join_ids.split(',')
+                for item in items:
+                    family_member_join_qs = FamilyMemberJoin.objects.filter(id=int(item))
+                    if not family_member_join_qs.exists():
+                        family_member_join_qs.delete()
             return response.json(0)
         except Exception as e:
             print(e)