|
@@ -118,7 +118,13 @@ class GatewayDeviceView(View):
|
|
|
@return:
|
|
|
"""
|
|
|
user_family_qs = UserFamily.objects.filter(user_id=user_id).values()
|
|
|
- family_list = list(user_family_qs) if user_family_qs.exists() else []
|
|
|
+ family_list = []
|
|
|
+ if user_family_qs.exists():
|
|
|
+ for item in user_family_qs:
|
|
|
+ room_qs = FamilyRoom.objects.filter(family_id=item['id']).order_by('sort') \
|
|
|
+ .values('id', 'name')
|
|
|
+ item['rooms'] = list(room_qs)
|
|
|
+ family_list.append(item)
|
|
|
return response.json(0, family_list)
|
|
|
|
|
|
@classmethod
|