Merge branch 'hk_now' into 'test'

update

See merge request alpha/physical!343

search/views/topic.py

@@ -78,19 +78,22 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
                     have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
         have_read_topic_id_list.extend(promote_topic_list)
         useful_topic_id_list = list()
-        #有用标签召回
-        if usefulrecall != -1 and user_id != -1:
-            useful_topic_id_list = TopicUtils.userful_tag_topic_list(user_id,have_read_topic_id_list,4,"topic-high-star","6")
-            # user_similar_score_redis_key = "physical:user_similar_score:user_id:" + str(user_id)
-            # redis_user_similar_score_redis_val = redis_client.get(user_similar_score_redis_key)
-            # user_similar_score_redis_list = json.loads(
-            #     redis_user_similar_score_redis_val) if redis_user_similar_score_redis_val else []
-            size = size - len(useful_topic_id_list)
-            have_read_topic_id_list = have_read_topic_id_list.extend(useful_topic_id_list)
         recommend_topic_user_list = list()
         attention_tag_list = list()
         recommend_topic_list = list()
         if query is None:
+          if user_id != -1:
+            # 有用标签召回
+            if usefulrecall != -1:
+                useful_topic_id_list = TopicUtils.userful_tag_topic_list(user_id, have_read_topic_id_list, 4,
+                                                                         "topic-high-star", "6")
+                # user_similar_score_redis_key = "physical:user_similar_score:user_id:" + str(user_id)
+                # redis_user_similar_score_redis_val = redis_client.get(user_similar_score_redis_key)
+                # user_similar_score_redis_list = json.loads(
+                #     redis_user_similar_score_redis_val) if redis_user_similar_score_redis_val else []
+                size = size - len(useful_topic_id_list)
+                have_read_topic_id_list = have_read_topic_id_list.extend(useful_topic_id_list)
+
             # linucb 推荐帖子
             topic_recommend_redis_key = "physical:linucb:topic_recommend:device_id:" + str(device_id)