Merge branch 'branch_0520' into 'test'

Branch 0520

See merge request alpha/physical!335

search/views/group.py

@@ -10,6 +10,7 @@ from libs.es import ESPerform
 from search.utils.group import GroupUtils
 from search.utils.common import GroupSortTypes
 from libs.es import ESPerform
+from trans2es.models.pictorial import PictorialTopics
 
 
 @bind("physical/search/query_pictorial")
@@ -209,7 +210,7 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
 @bind("physical/search/pictorial_topic_sort")
 def pictorial_topic_sort(pictorial_id=-1, offset=0, size=10):
     """
-    :remark 小组排序,缺少：前1天发评论人数＊x
+    :remark 画报排序 人气 部分
     :param user_id:
     :param sort_type:
     :param offset:
@@ -241,12 +242,15 @@ 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)
 
-        logging.info("get pictorial_topic_sort res:%s"%result_dict)
-
         for item in result_dict["hits"]:
             topic_id = item["_source"]["id"]
             pict_pictorial_ids_list.append(topic_id)
 
+        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}
 
     except: