|
|
@@ -69,7 +69,7 @@ class EquipmentFamilyView(View):
|
|
|
return self.family_save(user_id, request_dict, response)
|
|
|
# 家庭设置
|
|
|
elif operation == 'family-setting':
|
|
|
- return self.get_family_setting(user_id, request_dict, response)
|
|
|
+ return self.get_family_setting(request_dict, response)
|
|
|
# 家庭成员删除
|
|
|
elif operation == 'member-del':
|
|
|
return self.family_member_del(user_id, request_dict, response)
|
|
|
@@ -316,6 +316,7 @@ class EquipmentFamilyView(View):
|
|
|
sql += 'FROM device_info d INNER JOIN family_room_device l ON d.id = l.device_id '
|
|
|
sql += 'WHERE d.userID_id = %s AND d.isExist != %s '
|
|
|
if family_id:
|
|
|
+ family_id = int(family_id)
|
|
|
user_id = UserFamily.objects.filter(id=family_id).first().user_id
|
|
|
sql += ' AND l.family_id = %s '
|
|
|
if room_id and is_room_other:
|
|
|
@@ -592,10 +593,9 @@ class EquipmentFamilyView(View):
|
|
|
return items
|
|
|
|
|
|
@classmethod
|
|
|
- def get_family_setting(cls, user_id, request_dict, response):
|
|
|
+ def get_family_setting(cls, request_dict, response):
|
|
|
"""
|
|
|
家庭设置
|
|
|
- @param user_id:
|
|
|
@param request_dict: 请求
|
|
|
@param response: 响应
|
|
|
@return: 家庭列表items
|
