删除设备数据上传序列号文件且选中序列号解绑uid才解绑uid

AdminController/DeviceManagementController.py

@@ -465,10 +465,7 @@ class DeviceManagement(View):
                     uid_company_serial_qs = UIDCompanySerialModel.objects.filter(
                         company_serial__serial_number__in=serial_number_list).values('uid__uid')
                     uidList = [item[key] for item in uid_company_serial_qs for key in item]
-                    # 解绑uid数据,重置序列号状态
-                    UIDModel.objects.filter(uid__in=uidList).update(status=0)
-                    UIDCompanySerialModel.objects.filter(uid__uid__in=uidList).delete()
-                    CompanySerialModel.objects.filter(serial_number__in=serial_number_list).update(status=1)
+
                 # 根据删除项删除相关数据
                 if '设备信息数据' in delDataOptions:
                     Device_Info.objects.filter(UID__in=uidList).delete()
@@ -493,8 +490,13 @@ class DeviceManagement(View):
                     Order_Model.objects.filter(UID__in=uidList, order_type=0).delete()
                     Device_Info.objects.filter(UID__in=uidList).update(vodPrimaryUserID='', vodPrimaryMaster='')
 
-                # 序列号加入重置状态redis列表
-                if serialNumberList is not None:
+                # 上传序列号文件且选中序列号解绑uid
+                if serialNumberList is not None and '序列号解绑uid' in delDataOptions:
+                    # 解绑uid数据
+                    UIDModel.objects.filter(uid__in=uidList).update(status=0)
+                    UIDCompanySerialModel.objects.filter(uid__uid__in=uidList).delete()
+                    CompanySerialModel.objects.filter(serial_number__in=serial_number_list).update(status=1)
+                    # 序列号加入重置状态redis列表
                     redis_obj = RedisObject()
                     for serial in serial_number_list:
                         redis_obj.rpush(UNUSED_SERIAL_REDIS_LIST, serial)