2 Commits 6142120b17 ... 9c0fcfd33c

Author SHA1 Message Date
  Ansjer 9c0fcfd33c Merge remote-tracking branch 'remotes/origin/peng' into test 9 months ago
  peng fedd10d7c9 返回昵称 9 months ago
1 changed files with 3 additions and 3 deletions
  1. 3 3
      Controller/EquipmentManagerV3.py

+ 3 - 3
Controller/EquipmentManagerV3.py

@@ -1213,12 +1213,12 @@ class EquipmentManagerV3(View):
         if not uid:
             return response.json(444)
         try:
-            device_qs = Device_Info.objects.filter(UID=uid).values('userID', 'userID__username', 'noteName')
+            device_qs = Device_Info.objects.filter(UID=uid).values('userID', 'userID__NickName', 'noteName')
             button_qs = UserAudioVideoPush.objects.filter(uid=uid).values('buttonUser1', 'buttonUser2')
             res = []
             for item in device_qs:
-                noteName = item['noteName'] if item['noteName'] else item['userID__username']
-                temp_dict = {'userId': item['userID'], 'username': item['userID__username'],
+                noteName = item['noteName'] if item['noteName'] else item['userID__NickName']
+                temp_dict = {'userId': item['userID'], 'username': item['userID__NickName'],
                              'noteName': noteName}
                 if not button_qs.exists():
                     res.append(temp_dict)