Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical

search/views/topic.py

@@ -119,12 +119,13 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             have_read_topic_id_list.extend(recommend_topic_list)
 
         have_read_topic_id_list_add_promote = list()
+        promote_recommend_topic_id_list = list()
         have_read_topic_id_list_add_promote.extend(have_read_topic_id_list)
-        # promote_recommend_topic_id_list = TopicHomeRecommend.objects.using(settings.SLAVE_DB_NAME).filter(
-        #     is_online=1).values_list("topic_id")
-        # if len(have_read_topic_id_list)>0:
-        #   for topic_id in promote_recommend_topic_id_list:
-        #      have_read_topic_id_list_add_promote.extend(topic_id)
+        promote_recommend_topic_id_list = TopicHomeRecommend.objects.using(settings.SLAVE_DB_NAME).filter(
+            is_online=1).values_list("topic_id")
+        if len(promote_recommend_topic_id_list)>0:
+          for topic_id in promote_recommend_topic_id_list:
+             have_read_topic_id_list_add_promote.extend(topic_id)
         topic_id_list = list()
 
         rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,