|
@@ -64,6 +64,9 @@ class EquipmentFamilyView(View):
|
|
|
# 获取家庭列表
|
|
|
elif operation == 'family-list':
|
|
|
return self.get_family_list(user_id, request_dict, response)
|
|
|
+ # 根据身份获取家庭列表
|
|
|
+ elif operation == "who-family-list":
|
|
|
+ return self.who_family_list(user_id, response)
|
|
|
# 家庭保存
|
|
|
elif operation == 'family-save':
|
|
|
return self.family_save(user_id, request_dict, response)
|
|
@@ -590,6 +593,21 @@ class EquipmentFamilyView(View):
|
|
|
return response.json(0, items)
|
|
|
return response.json(309)
|
|
|
|
|
|
+ @staticmethod
|
|
|
+ def who_family_list(user_id, response):
|
|
|
+
|
|
|
+ family_member_qs = FamilyMember.objects.filter(user_id=user_id, identity=0) \
|
|
|
+ .order_by('sort').values('identity', 'family_id', 'family__name', 'permission_id', 'permission__no',
|
|
|
+ 'family__location', 'user__username', 'user__userIconUrl')
|
|
|
+ items = EquipmentFamilyView.family_info_list(family_member_qs)
|
|
|
+
|
|
|
+ family_member_qstwo = FamilyMember.objects.filter(user_id=user_id, identity=1) \
|
|
|
+ .order_by('sort').values('identity', 'family_id', 'family__name', 'permission_id', 'permission__no',
|
|
|
+ 'family__location', 'user__username', 'user__userIconUrl')
|
|
|
+ itemstwo = EquipmentFamilyView.family_info_list(family_member_qstwo)
|
|
|
+
|
|
|
+ return response.json(0, {'items': items, 'itemstwo': itemstwo})
|
|
|
+
|
|
|
@staticmethod
|
|
|
def family_info_list(family_member_qs):
|
|
|
items = []
|