|
|
@@ -582,11 +582,13 @@ class EquipmentFamilyView(View):
|
|
|
user_family_qs = UserFamily.objects.filter(user_id=user_id)
|
|
|
if not user_family_qs.exists():
|
|
|
n_time = int(time.time())
|
|
|
- device_user = Device_User.objects.filter(userID=user_id)
|
|
|
+ device_user = Device_User.objects.filter(userID=user_id).values('username', 'userEmail')
|
|
|
if not device_user.exists():
|
|
|
return response.json(104)
|
|
|
+
|
|
|
# 创建默认家庭使用用户名或者邮箱作为名称
|
|
|
- family_name = device_user.username if device_user.username else device_user.userEmail
|
|
|
+ username = device_user[0]['username']
|
|
|
+ family_name = username if username else device_user[0]['userEmail']
|
|
|
family_name = family_name + "的家" if lang == 'cn' else family_name + " home"
|
|
|
user_family = UserFamily.objects.create(user_id=user_id, name=family_name,
|
|
|
updated_time=n_time,
|
|
|
@@ -595,7 +597,7 @@ class EquipmentFamilyView(View):
|
|
|
member_permission_qs = FamilyMemberPermission.objects.filter(no='001').values('id')
|
|
|
permission_id = member_permission_qs.first()['id']
|
|
|
FamilyMember.objects.create(family_id=user_family.id, user_id=user_id,
|
|
|
- user_name=device_user.username, identity=1,
|
|
|
+ user_name=username, identity=1,
|
|
|
permission_id=int(permission_id), sort=1, updated_time=n_time,
|
|
|
created_time=n_time)
|
|
|
cls.family_device_binding(user_id, family_id=user_family.id)
|
