设备添加 成主用户

Controller/EquipmentManager.py

@@ -388,18 +388,16 @@ def addInterface(request):
                 # if is_bind:
                 #     return response.json(15)
 
-                main_exist = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
-                pk = CommonService.getUserID(getUser=False)
-                vodPrimaryUserID = ''
-                vodPrimaryMaster = ''
-                if not main_exist:
-
-                    duq = Device_User.objects.filter(userID=userID).values('username')
-                    if duq.exists():
-                        username = duq[0]['username']
-                        vodPrimaryUserID = username
-                        vodPrimaryMaster = userID
+                userName = Device_User.objects.get(userID=userID).username
+                main_exist = Device_Info.objects.filter(UID=UID)
+                main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
+                vodPrimaryUserID = userID
+                vodPrimaryMaster = userName
+                if main_exist.exists():
+                    vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
+                    vodPrimaryMaster = main_exist[0]['vodPrimaryMaster']
 
+                pk = CommonService.getUserID(getUser=False)
 
                 try:
                     # 判断是否有用户绑定

Controller/EquipmentManagerV3.py

@@ -92,17 +92,17 @@ class EquipmentManagerV3(View):
                     # if is_bind:
                     #     return response.json(15)
 
-                    main_exist = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
+                    userName = Device_User.objects.get(userID=userID).username
+                    main_exist = Device_Info.objects.filter(UID=UID)
+                    main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
+                    vodPrimaryUserID = userID
+                    vodPrimaryMaster = userName
+                    if main_exist.exists():
+                        vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
+                        vodPrimaryMaster = main_exist[0]['vodPrimaryMaster']
+
                     pk = CommonService.getUserID(getUser=False)
-                    vodPrimaryUserID = ''
-                    vodPrimaryMaster = ''
-                    if not main_exist:
-
-                        duq = Device_User.objects.filter(userID=userID).values('username')
-                        if duq.exists():
-                            username = duq[0]['username']
-                            vodPrimaryUserID = userID
-                            vodPrimaryMaster = username
+
                     try:
                         # 判断是否有用户绑定
                         nowTime = int(time.time())