Эх сурвалжийг харах

更新删除联系人参数

zhangdongming 3 жил өмнө
parent
commit
6f57aa97bf

+ 5 - 4
Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -74,10 +74,10 @@ class GatewayFamilyMemberView(View):
         @param response:
         @return:
         """
-        member_id = request_dict.get('memberId', None)
-        if not member_id:
+        join_id = request_dict.get('joinId', None)
+        if not join_id:
             return response.json()
-        family_member_join_qs = FamilyMemberJoin.objects.filter(id=member_id)
+        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)
@@ -407,7 +407,7 @@ class GatewayFamilyMemberView(View):
         family_id = request_dict.get('familyId', None)
         if not all([page_no, page_size, family_id]):
             return response.json(444)
-        member_join = FamilyMemberJoin.objects.filter(family_id=family_id).values('status', 'user__username',
+        member_join = FamilyMemberJoin.objects.filter(family_id=family_id).values('id', 'status', 'user__username',
                                                                                   'user__userIconUrl', 'user__phone',
                                                                                   'user__userEmail', 'updated_time',
                                                                                   'created_time',
@@ -421,6 +421,7 @@ class GatewayFamilyMemberView(View):
         result = []
         for item in member_join:
             result.append({
+                'joinId': item['id'],
                 'status': item['status'],
                 'userName': item['user__username'],
                 'userIconUrl': item['user__userIconUrl'],