|
@@ -46,12 +46,17 @@ class UserDeviceService:
|
|
|
(page - 1) * line:page * line]
|
|
|
dv_list = CommonService.qs_to_list(dv_qs)
|
|
|
uid_list = []
|
|
|
+ exist_uid_list = []
|
|
|
for item in dv_list:
|
|
|
- if item['primaryUserID'] and item['id'] == item['primaryUserID']:
|
|
|
- item['isPrimaryUser'] = 1
|
|
|
- else:
|
|
|
- item['isPrimaryUser'] = 0
|
|
|
- uid_list.append(item['UID'])
|
|
|
+ # 过滤重复uid
|
|
|
+ uid = item['UID']
|
|
|
+ if uid not in exist_uid_list:
|
|
|
+ exist_uid_list.append(uid)
|
|
|
+ if item['primaryUserID'] and item['id'] == item['primaryUserID']:
|
|
|
+ item['isPrimaryUser'] = 1
|
|
|
+ else:
|
|
|
+ item['isPrimaryUser'] = 0
|
|
|
+ uid_list.append(item['UID'])
|
|
|
return dv_list, uid_list
|
|
|
|
|
|
@classmethod
|