소스 검색

设备添加新表 记录主次用户5

chenshibin 4 년 전
부모
커밋
df03b03449
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      Controller/EquipmentManager.py
  2. 2 2
      Controller/EquipmentManagerV3.py

+ 2 - 2
Controller/EquipmentManager.py

@@ -418,7 +418,7 @@ def addInterface(request):
                         vodPrimaryMaster = ''
 
                 isusermain = False
-                if isvodPrimaryUserID != userID:
+                if isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
                     isusermain = True
 
                 uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
@@ -430,7 +430,7 @@ def addInterface(request):
                         isusermain = True
 
                 # 判断是否有已绑定用户
-                if is_bind and isCheckMainUser == '1' and isusermain and isvodPrimaryUserID != '':
+                if is_bind and isCheckMainUser == '1' and isusermain:
                     res = {
                         'id': pk,
                         'userID': userID,

+ 2 - 2
Controller/EquipmentManagerV3.py

@@ -123,7 +123,7 @@ class EquipmentManagerV3(View):
                             vodPrimaryMaster = ''
 
                     isusermain = False
-                    if isvodPrimaryUserID != userID:
+                    if isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
                         isusermain = True
 
                     uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
@@ -137,7 +137,7 @@ class EquipmentManagerV3(View):
 
 
                     # 判断是否有已绑定用户
-                    if is_bind and isCheckMainUser == '1' and isusermain and isvodPrimaryUserID != '':
+                    if is_bind and isCheckMainUser == '1' and isusermain:
                         res = {
                             'id': pk,
                             'userID': userID,