tt

Controller/UserController.py

@@ -1,5 +1,5 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 """
 @Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
 @AUTHOR: ASJRD018
@@ -12,7 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 from Model.models import Role
-import traceback,datetime
+import traceback, datetime
 
 import simplejson as json
 from django.contrib import auth
@@ -36,7 +36,7 @@ from Service.ModelService import ModelService
 from Service.TemplateService import TemplateService
 from Object.AliSmsObject import AliSmsObject
 from django.db.models import Q
-from Ansjer.config import AuthCode_Expire,SERVER_DOMAIN
+from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN
 
 
 # 获取验证码
@@ -790,7 +790,7 @@ class v2registerView(TemplateView):
         tko = TokenObject()
         res = tko.generate(data={'userID': userID, 'lang': response.lang})
         device_user_query_set = Device_User.objects.get(userID=userID)
-        #增加角色
+        # 增加角色
         user_qs[0].role.add(Role.objects.get(rid=1))
         role_dict = ModelService.own_role(userID=userID)
         res['rid'] = role_dict['rid']
@@ -805,10 +805,10 @@ class v2registerView(TemplateView):
             res['userIconUrl'] = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
         else:
             res['userIconUrl'] = ''
-        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','')
+        res['NickName'] = user_list[0]["NickName"] if user_list[0]["NickName"] is not None else ''
+        res['username'] = user_list[0]["username"] if user_list[0]["username"] is not None else ''
+        res['userEmail'] = user_list[0]["userEmail"] if user_list[0]["userEmail"] is not None else ''
+        res['phone'] = user_list[0]["phone"] if user_list[0]["phone"] is not None else ''
         print(res)
         return response.json(0, res)
 
@@ -1057,17 +1057,17 @@ class v2LoginView(TemplateView):
             res['permList'] = ModelService.own_permission(userID)
             res['userID'] = userID
             # 昵称，邮箱，电话，刷新，头像
-            user_list = user_qs.values("NickName","userIconUrl","userIconPath","username","userEmail","phone")
+            user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
             userIconPath = str(user_list[0]["userIconPath"])
             if userIconPath and userIconPath.find('static/') != -1:
                 userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
                 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]["NickName"] if user_list[0]["NickName"] is not None else ''
+            res['username'] = user_list[0]["username"] if user_list[0]["username"] is not None else ''
+            res['userEmail'] = user_list[0]["userEmail"] if user_list[0]["userEmail"] is not None else ''
+            res['phone'] = user_list[0]["phone"] if user_list[0]["phone"] is not None else ''
             print(res)
             return response.json(0, res)
         else: