Merge branch 'hk_now' into 'test'

fix bug

See merge request alpha/physical!342

search/views/topic.py

@@ -79,7 +79,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         have_read_topic_id_list.extend(promote_topic_list)
         useful_topic_id_list = list()
         #有用标签召回
-        if usefulrecall != -1:
+        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)
@@ -100,8 +100,9 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
                 linucb_recommend_topic_id_list = json.loads(recommend_topic_dict[b"data"])
 
                 # 推荐帖子是强插的，要保证推荐帖子不在已读里
-                recommend_topic_id_list = list(set(linucb_recommend_topic_id_list) - set(have_read_topic_id_list))
-                recommend_topic_id_list.sort(key=linucb_recommend_topic_id_list.index)
+                if linucb_recommend_topic_id_list != None:
+                   recommend_topic_id_list = list(set(linucb_recommend_topic_id_list) - set(have_read_topic_id_list))
+                   recommend_topic_id_list.sort(key=linucb_recommend_topic_id_list.index)
                 # cursor = int(str(recommend_topic_dict[b"cursor"], encoding="utf-8"))
                 # newcursor = cursor + 6
                 if len(recommend_topic_id_list) > 0:
@@ -110,7 +111,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
 
             if b"datadict" in recommend_topic_dict:
                 linucb_recommend_topic_id_dict = json.loads(recommend_topic_dict[b"datadict"])
-                if len(recommend_topic_list) == 6 and linucb_recommend_topic_id_dict is not None:
+                if linucb_recommend_topic_id_dict is not None and len(recommend_topic_list) >0:
                   for i in recommend_topic_list:
                     recommend_topic_user_list.append(linucb_recommend_topic_id_dict[str(i)])
             # 用户关注标签