Browse Source

返回地区国家名

guanhailong 2 years ago
parent
commit
fdea4ad69e
1 changed files with 3 additions and 1 deletions
  1. 3 1
      AdminController/UserManageController.py

+ 3 - 1
AdminController/UserManageController.py

@@ -370,6 +370,8 @@ class UserManagement(View):
                 rid = role.rid if role else 1  # 不存在角色默认分配为'Users'
                 rid = role.rid if role else 1  # 不存在角色默认分配为'Users'
                 user_ex_qs = UserExModel.objects.filter(userID_id=device_user.userID).values('appBundleId')
                 user_ex_qs = UserExModel.objects.filter(userID_id=device_user.userID).values('appBundleId')
                 app_bundle_id = user_ex_qs[0]['appBundleId'] if user_ex_qs.exists() else ''
                 app_bundle_id = user_ex_qs[0]['appBundleId'] if user_ex_qs.exists() else ''
+                region_country = CountryModel.objects.filter(number=device_user.region_country).values('country_name')
+                region_country = region_country[0]['country_name'] if region_country.exists() else '未知国家'
                 user_list.append({
                 user_list.append({
                     'userID': device_user.userID,
                     'userID': device_user.userID,
                     'username': device_user.username,
                     'username': device_user.username,
@@ -380,7 +382,7 @@ class UserManagement(View):
                     'data_joined': device_user.data_joined.strftime("%Y-%m-%d %H:%M:%S"),
                     'data_joined': device_user.data_joined.strftime("%Y-%m-%d %H:%M:%S"),
                     'last_login': device_user.last_login.strftime("%Y-%m-%d %H:%M:%S"),
                     'last_login': device_user.last_login.strftime("%Y-%m-%d %H:%M:%S"),
                     'appBundleId': app_bundle_id,
                     'appBundleId': app_bundle_id,
-                    'region_country':device_user.region_country
+                    'region_country':region_country
                 })
                 })
             print('user_list: ', user_list)
             print('user_list: ', user_list)
             return response.json(0, {'list': user_list, 'total': total})
             return response.json(0, {'list': user_list, 'total': total})