v3LoginView类根据number返回status（与数据库国家相同返回0，不相同返回1）

Controller/UserController.py

@@ -2013,31 +2013,6 @@ class v3LoginView(TemplateView):
         users = user_qs.values('role__rid', 'role__roleName', 'userID', 'NickName', 'username', 'userEmail',
                                'phone', 'password', 'userIconPath', 'fingerprint_enable', 'fingerprint_key',
                                'subscribe_email', 'region_country')[0]
-        number = int(number)
-        region_country = users['region_country']
-        if number != region_country and region_country != 0:
-            region_country = users['region_country']
-            country_qs = CountryModel.objects.filter(id=region_country).values('country_name')
-            res = {
-                'refresh_expire': '',
-                'subscribe_email': '',
-                'authType': '',
-                'access_expire': '',
-                'userEmail': '',
-                'NickName': '',
-                'userIconUrl': '',
-                'phone': '',
-                'permList': '',
-                'refresh_token': '',
-                'username': '',
-                'roleName': '',
-                'access_token': '',
-                'rid': '',
-                'userID': '',
-                'status': 1,
-                'region': country_qs[0]['country_name']
-            }
-            return response.json(0, res)
         if not check_password(password, users['password']):
             return response.json(111)
 
@@ -2070,11 +2045,18 @@ class v3LoginView(TemplateView):
                                            push_type=push_type, token_val=token_val, m_code=m_code, lang=lang, tz=tz)
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
+        number = int(number)
+        region_country = users['region_country']
         if not number or number == 0:
             user_qs.update(last_login=now_time, language=response.lang)
         else:
-            user_qs.update(last_login=now_time, language=response.lang, region_country=number)
-        region_qs = CountryModel.objects.filter(id=number).values('country_name')
+            if number != region_country and region_country != 0:
+                res['status'] = 1
+                user_qs.update(last_login=now_time, language=response.lang)
+            else:
+                res['status'] = 0
+                user_qs.update(last_login=now_time, language=response.lang, region_country=number)
+        region_qs = CountryModel.objects.filter(id=region_country).values('country_name')
 
         res['rid'] = users['role__rid']
         res['roleName'] = users['role__roleName']
@@ -2093,7 +2075,6 @@ class v3LoginView(TemplateView):
         res['phone'] = users['phone'] if users['phone'] is not None else ''
         res['authType'] = auth_type
         res['subscribe_email'] = users['subscribe_email'] if users['subscribe_email'] is not None else ''
-        res['status'] = 0
         res['region'] = region_qs[0]['country_name'] if region_qs[0]['country_name'] is not None else ''
         return response.json(0, res)