|
@@ -107,11 +107,6 @@ class EquipmentManagerV3(View):
|
|
|
vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
|
|
|
vodPrimaryMaster = main_exist[0]['vodPrimaryMaster']
|
|
|
|
|
|
- uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
|
|
|
- if uid_main_exist.exists():
|
|
|
- vodPrimaryUserID = uid_main_exist[0]['user_id']
|
|
|
- vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
|
|
|
-
|
|
|
is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID', 'vodPrimaryUserID')
|
|
|
isvodPrimaryUserID = ''
|
|
|
|
|
@@ -127,8 +122,22 @@ class EquipmentManagerV3(View):
|
|
|
vodPrimaryUserID = ''
|
|
|
vodPrimaryMaster = ''
|
|
|
|
|
|
+ isusermain = False
|
|
|
+ if isvodPrimaryUserID != userID:
|
|
|
+ isusermain = True
|
|
|
+
|
|
|
+ uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
|
|
|
+ if uid_main_exist.exists():
|
|
|
+ vodPrimaryUserID = uid_main_exist[0]['user_id']
|
|
|
+ vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
|
|
|
+
|
|
|
+ if vodPrimaryUserID != userID:
|
|
|
+ isusermain = True
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
# 判断是否有已绑定用户
|
|
|
- if is_bind and isCheckMainUser == '1' and isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
|
|
|
+ if is_bind and isCheckMainUser == '1' and isusermain and isvodPrimaryUserID != '':
|
|
|
res = {
|
|
|
'id': pk,
|
|
|
'userID': userID,
|