去掉空画报

search/views/group.py

@@ -250,25 +250,13 @@ def pictorial_topic_sort(pictorial_id=-1, offset=0, size=10):
         es_cli_obj = ESPerform.get_cli()
         result_dict = ESPerform.get_search_results(es_cli_obj, "topic", q, offset, size)
 
-<<<<<<< HEAD
         logging.info("get pictorial_topic_sort res:%s" % result_dict)
 
-=======
->>>>>>> 782c974fb2bbb3a061ceb4440c72fe579b17ad26
         for item in result_dict["hits"]:
             topic_id = item["_source"]["id"]
             pict_pictorial_ids_list.append(topic_id)
 
-<<<<<<< HEAD
         return {"pict_pictorial_ids_list": pict_pictorial_ids_list}
-=======
-        if len(pict_pictorial_ids_list)==0 and offset==0:
-            pict_pictorial_ids_list = list(
-                PictorialTopics.objects.filter(pictorial_id=pictorial_id, is_online=True, is_deleted=False).values_list(
-                    "topic_id", flat=True)[offset:size])
-
-        return {"pict_pictorial_ids_list":pict_pictorial_ids_list}
->>>>>>> 782c974fb2bbb3a061ceb4440c72fe579b17ad26
 
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())