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