p master

Controller/EquipmentManager.py

@@ -191,8 +191,7 @@ def queryUserEquipmentInterface(request):
         for dm in ubql:
             if p['fields']['UID'] == dm['uid']:
                 p['fields']['vod'].append(dm)
-        if p['fields']['primaryUserID']:
-            p['fields']['master'] = ModelService.get_user_name(p['fields']['primaryUserID'])
+        p['fields']['master'] = ModelService.get_user_name(p['fields']['primaryUserID'])
         res.append(p)
     # print(res)
     return response.json(0, {'datas': res})

Service/ModelService.py

@@ -87,11 +87,13 @@ class ModelService:
     @staticmethod
     def get_user_name(userID):
         try:
-            device_user = Device_User.objects.get(userID=userID)
+            if userID:
+                device_user = Device_User.objects.get(userID=userID)
+                return device_user.username
+            else:
+                return ''
         except Exception as e:
-            return None
-        else:
-            return device_user.username
+            return ''
 
     # 根据username获取userID
     @staticmethod