|
@@ -12,7 +12,7 @@ from django.views.generic import TemplateView, View
|
|
|
|
|
|
from Ansjer.config import BASE_DIR
|
|
from Ansjer.config import BASE_DIR
|
|
from Ansjer.config import SERVER_DOMAIN
|
|
from Ansjer.config import SERVER_DOMAIN
|
|
-from Model.models import Role, Device_User, UserOauth2Model, UserExModel
|
|
|
|
|
|
+from Model.models import Role, Device_User, UserOauth2Model, UserExModel, UserRegionModel
|
|
from Object.RedisObject import RedisObject
|
|
from Object.RedisObject import RedisObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
@@ -66,6 +66,10 @@ class showUserMoreView(TemplateView):
|
|
roleName = ModelService.getRole(rid=v['fields']['role'][0])
|
|
roleName = ModelService.getRole(rid=v['fields']['role'][0])
|
|
sqlDict["datas"][k]['fields']['rolename'] = roleName
|
|
sqlDict["datas"][k]['fields']['rolename'] = roleName
|
|
# 增加oauth2关联数据
|
|
# 增加oauth2关联数据
|
|
|
|
+ user_region_qs = UserRegionModel.objects.filter(user_id=userID)
|
|
|
|
+ if user_region_qs.exists():
|
|
|
|
+ region_id = user_region_qs[0].region_id
|
|
|
|
+ sqlDict['datas'][0]['region_id'] = region_id
|
|
ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType',flat=True)
|
|
ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType',flat=True)
|
|
sqlDict["oauth2"] = list(ua_qs)
|
|
sqlDict["oauth2"] = list(ua_qs)
|
|
return response.json(0, sqlDict)
|
|
return response.json(0, sqlDict)
|