云存回放表扩表

Service/VodHlsService.py

@@ -46,14 +46,15 @@ class SplitVodHlsObject:
         分表获取云存信息数据
         @return: vod_hls
         """
-        vod_hls_union = VodHls01.objects.none()
+        vod_hls_union = VodHls01.objects.none().annotate(tab_val=Value(11, output_field=CharField()))
         if kwargs['type_list']:
             kwargs = self.vod_query_param(**kwargs)
-            for item in kwargs['id__in']:
-                tab_val = str(item['tab_val'] + 10)
-                vod_hls_union = vod_hls_union.union(
-                    Vod_Hls_List[item['tab_val'] - 1].objects.filter(id=item['vod_id']).annotate(
-                        tab_val=Value(tab_val, output_field=CharField())))
+            if 'id__in' in kwargs:
+                for item in kwargs['id__in']:
+                    tab_val = str(item['tab_val'] + 10)
+                    vod_hls_union = vod_hls_union.union(
+                        Vod_Hls_List[item['tab_val'] - 1].objects.filter(id=item['vod_id']).annotate(
+                            tab_val=Value(tab_val, output_field=CharField())))
         else:
             kwargs.pop('type_list')
             for index, vod_hls_model in enumerate(Vod_Hls_List):
@@ -116,8 +117,6 @@ class SplitVodHlsObject:
                                          kwargs.get('type_list'))
         if vod_ids:
             kwargs['id__in'] = vod_ids
-        if types and not vod_ids:
-            return []
         kwargs.pop('type_list')
         return kwargs