|
@@ -198,10 +198,13 @@ def queryUserEquipmentInterface(request):
|
|
|
for dm in ubql:
|
|
|
if p['fields']['UID'] == dm['uid']:
|
|
|
p['fields']['vod'].append(dm)
|
|
|
- if p['fields']['primaryUserID'] in pm_dict.keys():
|
|
|
- p['fields']['primaryMaster'] = pm_dict[p['fields']['primaryUserID']]
|
|
|
- else:
|
|
|
+ if p['fields']['primaryUserID']:
|
|
|
p['fields']['primaryMaster'] = ''
|
|
|
+ else:
|
|
|
+ if p['fields']['primaryUserID'] in pm_dict.keys():
|
|
|
+ p['fields']['primaryMaster'] = pm_dict[p['fields']['primaryUserID']]
|
|
|
+ else:
|
|
|
+ p['fields']['primaryMaster'] = ''
|
|
|
res.append(p)
|
|
|
return response.json(0, {'datas': res})
|
|
|
|