推送跳转

Service/EquipmentInfoService.py

@@ -566,11 +566,11 @@ class EquipmentInfoService:
         @param kwargs:
         @return: qs
         """
-        equipment_info_1 = EQUIPMENT_INFO_MODEL_LIST[0].objects.filter(**kwargs).annotate(
+        equipment_info_union = EQUIPMENT_INFO_MODEL_LIST[0].objects.filter(**kwargs).annotate(
             tab_val=Value('11', output_field=CharField()))
         for index, equipment_info_model in enumerate(EQUIPMENT_INFO_MODEL_LIST[1:]):
             tab_val = str(index + 2)
-            equipment_info_union = equipment_info_1.union(equipment_info_model.objects.filter(**kwargs).annotate(
+            equipment_info_union = equipment_info_union.union(equipment_info_model.objects.filter(**kwargs).annotate(
                 tab_val=Value(tab_val, output_field=CharField())))
         equipment_info_union = cls.get_equipment_info_union_page(equipment_info_union, 1, 10)
         count = equipment_info_union.count()