chenjunkai 5 years ago
parent
commit
a219f8d423
1 changed files with 5 additions and 2 deletions
  1. 5 2
      Controller/UserManger.py

+ 5 - 2
Controller/UserManger.py

@@ -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
+from Model.models import Role, Device_User, UserOauth2Model
 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
@@ -65,6 +65,9 @@ class showUserMoreView(TemplateView):
             if len(v['fields']['role']):
             if len(v['fields']['role']):
                 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关联数据
+        ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType',flat=True)
+        sqlDict["oauth2"] = list(ua_qs)
         return response.json(0, sqlDict)
         return response.json(0, sqlDict)
 
 
 
 
@@ -375,4 +378,4 @@ class setUserValidView(View):
 
 
 @csrf_exempt
 @csrf_exempt
 def success(request):
 def success(request):
-    return HttpResponse(status=200)
+    return HttpResponse(status=200)