|
|
@@ -792,11 +792,6 @@ class v2registerView(TemplateView):
|
|
|
device_user_query_set = Device_User.objects.get(userID=userID)
|
|
|
#增加角色
|
|
|
user_qs[0].role.add(Role.objects.get(rid=1))
|
|
|
- # if device_user_query_set.role.all():
|
|
|
- # device_user_query_set.role.set([1])
|
|
|
- # else:
|
|
|
- # role_user_query_set = Role.objects.get(rid=1)
|
|
|
- # device_user_query_set.role.add(role_user_query_set)
|
|
|
role_dict = ModelService.own_role(userID=userID)
|
|
|
res['rid'] = role_dict['rid']
|
|
|
res['roleName'] = role_dict['roleName']
|
|
|
@@ -810,10 +805,10 @@ class v2registerView(TemplateView):
|
|
|
res['userIconUrl'] = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
|
|
|
else:
|
|
|
res['userIconUrl'] = ''
|
|
|
- res['NickName'] = user_list[0]["NickName"]
|
|
|
- res['username'] = user_list[0]["username"]
|
|
|
- res['userEmail'] = user_list[0]["userEmail"]
|
|
|
- res['phone'] = user_list[0]["phone"]
|
|
|
+ res['NickName'] = user_list[0].get('NickName','')
|
|
|
+ res['username'] = user_list[0].get('username','')
|
|
|
+ res['userEmail'] = user_list[0].get('userEmail','')
|
|
|
+ res['phone'] = user_list[0].get('phone','')
|
|
|
print(res)
|
|
|
return response.json(0, res)
|
|
|
|
chenjunkai