完善获取用户完整信息接口

Controller/UserManger.py

@@ -72,26 +72,32 @@ class showUserMoreView(TemplateView):
                         userIconUrl = SERVER_DOMAIN + 'account/getAvatar/' + userIconPath
                         sqlDict['datas'][k]['fields']['userIconUrl'] = userIconUrl
 
-                # 确认地区字段和当前地区
+                # 确认地区字段
                 sqlDict['datas'][k]['fields']['region_status'] = 1 if region_status else 0
-                sqlDict['datas'][k]['fields']['region'] = ''
-                if region_status:
-                    region_country = sqlDict['datas'][k]['fields']['region_country']
-                    language_qs = LanguageModel.objects.filter(lang=lang).values('id')
-                    region_qs = CountryLanguageModel.objects.filter(country_id=region_country,
-                                                                    language_id=language_qs[0]['id']).values('country_name')
-                    sqlDict['datas'][k]['fields']['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
 
                 if len(v['fields']['role']):
                     roleName = ModelService.getRole(rid=v['fields']['role'][0])
                     sqlDict["datas"][k]['fields']['rolename'] = roleName
+
+                # 根据region_country的值返回api和region数据
+                sqlDict["datas"][k]['fields']['api'] = ''
+                sqlDict['datas'][k]['fields']['region'] = ''
                 region_country = sqlDict["datas"][k]['fields']['region_country']
-                if not region_country == 0:
+                if region_country != 0:
+                    # api数据
                     country_qs = CountryLanguageModel.objects.filter(country_id=region_country).values(
                         'country__region__api')
                     sqlDict["datas"][k]['fields']['api'] = country_qs[0]['country__region__api']
-                else:
-                    sqlDict["datas"][k]['fields']['api'] = ''
+                    if region_country == 1:     # 中国返回美洲域名
+                        sqlDict["datas"][k]['fields']['api'] = 'https://www.dvema.com/'
+
+                    # region数据
+                    region_country = sqlDict['datas'][k]['fields']['region_country']
+                    language_qs = LanguageModel.objects.filter(lang=lang).values('id')
+                    region_qs = CountryLanguageModel.objects.filter(country_id=region_country,
+                                                                    language_id=language_qs[0]['id']).\
+                        values('country_name')
+                    sqlDict['datas'][k]['fields']['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
 
             # 增加oauth2关联数据
             ua_qs = UserOauth2Model.objects.filter(userID_id=user_id).values_list('authType', flat=True)