成员可以查看家庭成员信息，房间详情成员不可用访问

Controller/SensorGateway/EquipmentFamilyController.py

@@ -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)
@@ -539,10 +539,9 @@ class EquipmentFamilyView(View):
         return response.json(309)
 
     @classmethod
-    def get_family_setting(cls, user_id, request_dict, response):
+    def get_family_setting(cls, request_dict, response):
         """
         家庭设置
-        @param user_id: 用户id
         @param request_dict: 请求
         @param response: 响应
         @return: 家庭列表items
@@ -550,7 +549,7 @@ class EquipmentFamilyView(View):
         family_id = request_dict.get('familyId', None)
         if not family_id:
             return response.json(444)
-        user_family_qs = UserFamily.objects.filter(id=family_id, user_id=user_id).values('id', 'name', 'location')
+        user_family_qs = UserFamily.objects.filter(id=family_id).values('id', 'name', 'location')
         if not user_family_qs.exists():
             return response.json(404)
         family_dict = user_family_qs.first()

Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -49,7 +49,7 @@ class GatewayFamilyRoomView(View):
             return self.room_del(app_user_id, request_dict, response)
         # 房间详情
         elif operation == 'details':
-            return self.get_room_details(request_dict, response)
+            return self.get_room_details(app_user_id, request_dict, response)
 
     @classmethod
     def room_device_save(cls, app_user_id, request_dict, response):
@@ -145,9 +145,10 @@ class GatewayFamilyRoomView(View):
         return response.json(0)
 
     @classmethod
-    def get_room_details(cls, request_dict, response):
+    def get_room_details(cls, app_user_id, request_dict, response):
         """
         房间设备详情(所在当前房间下，和所在家庭不在当前房间下的主设备)
+        @param app_user_id:
         @param request_dict:
         @param response:
         @return:
@@ -156,6 +157,9 @@ class GatewayFamilyRoomView(View):
         room_id = request_dict.get('roomId', None)
         if not all([family_id, room_id]):
             return response.json(444)
+        is_owner = EquipmentFamilyView.get_family_owner(app_user_id, family_id)
+        if not is_owner:
+            return response.json(404)
         family_id = int(family_id)
         room_id = int(room_id)
         room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id, room_id=room_id).order_by('sort').values(