优化返回备注名称

Controller/EquipmentManagerV3.py

@@ -1210,7 +1210,7 @@ class EquipmentManagerV3(View):
         """
         获取推送按钮用户
         """
-        uid = request_dict.get('uid', None) 
+        uid = request_dict.get('uid', None)
         if not uid:
             return response.json(444)
         try:
@@ -1218,8 +1218,9 @@ class EquipmentManagerV3(View):
             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']}
+                             'noteName': noteName}
                 if not button_qs.exists():
                     res.append(temp_dict)
                     continue