Merge branch 'hk_now' into 'master'

bug fix

See merge request alpha/physical!262

linucb/views/collect_data.py

@@ -113,16 +113,16 @@ class CollectData(object):
 
                 if len(recommend_topic_id_list)>0:
                     tag_topic_id_list = recommend_topic_id_list + tag_topic_id_list
-                else:
-                    if cursor==0 and len(redis_topic_list)>0:
-                        tag_topic_id_list = redis_topic_list[:2] + tag_topic_id_list
-                        tag_topic_id_list = list(set(tag_topic_id_list))
-
                     redis_data_dict = {
                         "data": json.dumps(tag_topic_id_list),
                         "cursor":0
                     }
                     redis_client.hmset(topic_recommend_redis_key,redis_data_dict)
+                else:
+                    if cursor<=0 and len(redis_topic_list)>0:
+                        tag_topic_id_list = redis_topic_list[:2] + tag_topic_id_list
+                        tag_topic_id_list = list(set(tag_topic_id_list))
+
             return True
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())