Merge branch 'hk' into 'test'

update

See merge request alpha/physical!316

search/views/topic.py

@@ -100,7 +100,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             recommend_topic_user_list = list()
             if b"datadict" in recommend_topic_dict:
                 recommend_topic_id_dict = json.loads(recommend_topic_dict[b"datadict"])
-                if len(recommend_topic_list) == 6:
+                if len(recommend_topic_list) == 6 and recommend_topic_id_dict is not None:
                   for i in recommend_topic_list:
                     recommend_topic_user_list.append(recommend_topic_id_dict[str(i)])
             # 用户关注标签