Merge branch 'region-h-ab' into dev

video_recall.py

@@ -1016,9 +1016,13 @@ class PoolRecall(object):
         province_code = self.client_info.get('provinceCode', '-1')
         if province_code == '':
             province_code = '-1'
-        t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
-             gevent.spawn(self.region_dup_recall, province_code, 1, size, expire_time),
-             gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)]
+        if province_code == '-1':
+            t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
+                 gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)]
+        else:
+            t = [gevent.spawn(self.rov_pool_recall_with_region_by_h, province_code, size),
+                 gevent.spawn(self.region_dup_recall, province_code, 1, size, expire_time),
+                 gevent.spawn(self.region_dup_recall, province_code, 2, size, expire_time)]
         gevent.joinall(t)
         region_recall_result_list = [i.get() for i in t]
         # 将已获取到的视频按顺序去重合并