Merge branch 'hk_now' into 'master'

fix bug

See merge request alpha/physical!237

linucb/views/collect_data.py

@@ -77,8 +77,8 @@ class CollectData(object):
                 if click_topic_tag_list:
                     recommend_topic_id_list_click = ESPerform.get_tag_topic_list(click_topic_tag_list,
                                                                                  have_read_topic_id_list)
-                if len(recommend_topic_id_list) > 0:
-                    num = min(len(recommend_topic_id_list), 2)
+                if len(recommend_topic_id_list_click) > 0:
+                    num = min(len(recommend_topic_id_list_click), 2)
                     recommend_topic_id_list.extend(recommend_topic_id_list_click[0:num])
 
                 tag_id_list = recommend_tag_list[0:100]