ttt

Controller/EquipmentManager.py

@@ -35,7 +35,7 @@ def addNewUserEquipment(userID, deviceContent, response):
                                 # 判断用户密码是否正确
                                 # dev_pass = deviceData.get('View_Password', '')
                                 # if is_bind[0].View_Password == dev_pass:
-                                deviceData['NickName'] = is_bind[0].NickName
+                                # deviceData['NickName'] = is_bind[0].NickName
                                 if 'isShare' in deviceData:
                                     deviceData['isShare'] = True
                                 bind_userID = is_bind[0].userID_id

Controller/UserController.py

@@ -1024,16 +1024,16 @@ class v2LoginView(TemplateView):
     def valid_login(self, user_qs, password, response):
         if not check_password(password, user_qs[0].password):
             return response.json(111)
-        userID = user_qs[0].userID
-        print('userID' + userID)
+        # userID = user_qs[0].userID
+        role_qs = user_qs.values('role__permission', 'role__rid', 'role__roleName', 'userID')
+        userID = role_qs[0]['userID']
         tko = TokenObject()
         res = tko.generate(data={'userID': userID, 'lang': response.lang})
         if tko.code == 0:
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
             user_qs.update(last_login=now_time, online=True, language=response.lang)
-            role_dict = ModelService.own_role(userID=userID)
-            res['rid'] = role_dict['rid']
-            res['roleName'] = role_dict['roleName']
+            res['rid'] = role_qs[0]['role__rid']
+            res['roleName'] = role_qs[0]['role__roleName']
             res['permList'] = ModelService.own_permission(userID)
             res['userID'] = userID
             # 昵称，邮箱，电话，刷新，头像