chenshibin 4 жил өмнө
parent
commit
613ac4e9d5

+ 8 - 1
Controller/EquipmentManager.py

@@ -401,7 +401,14 @@ def addInterface(request):
 
                 is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID')
                 # 判断是否有已绑定用户
-                if is_bind and isCheckMainUser == '1':
+                isvodPrimaryUserID = ''
+
+                for forbind in is_bind:
+                    if forbind['vodPrimaryUserID'] != '':
+                        isvodPrimaryUserID = forbind['vodPrimaryUserID']
+
+                # 判断是否有已绑定用户
+                if is_bind and isCheckMainUser == '1' and isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
                     res = {
                         'id': pk,
                         'userID': userID,

+ 8 - 2
Controller/EquipmentManagerV3.py

@@ -103,9 +103,15 @@ class EquipmentManagerV3(View):
                         vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
                         vodPrimaryMaster = main_exist[0]['vodPrimaryMaster']
 
-                    is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID')
+                    is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID', 'vodPrimaryUserID')
+                    isvodPrimaryUserID = ''
+
+                    for forbind in is_bind:
+                        if forbind['vodPrimaryUserID'] != '':
+                            isvodPrimaryUserID = forbind['vodPrimaryUserID']
+
                     # 判断是否有已绑定用户
-                    if is_bind and isCheckMainUser == '1':
+                    if is_bind and isCheckMainUser == '1' and isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
                         res = {
                             'id': pk,
                             'userID': userID,