Merge branch 'hk' into 'test'

revise history data

See merge request alpha/physical!309

search/views/topic.py

@@ -87,7 +87,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             recommend_topic_dict = redis_client.hgetall(topic_recommend_redis_key)
             if b"data" in recommend_topic_dict:
                 recommend_topic_id_list = json.loads(recommend_topic_dict[b"data"])
-                recommend_topic_id_dict = json.loads(recommend_topic_dict[b"datadict"])
+
 
                 # 推荐帖子是强插的，要保证推荐帖子不在已读里
                 recommend_topic_id_list = list(set(recommend_topic_id_list) - set(have_read_topic_id_list))
@@ -98,8 +98,10 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
                     redis_client.hset(topic_recommend_redis_key, "cursor", newcursor)
 
             recommend_topic_user_list = list()
-            if len(recommend_topic_list) == 6:
-                for i in recommend_topic_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:
+                  for i in recommend_topic_id_dict:
                     recommend_topic_user_list.append(i.values())
             # 用户关注标签
             redis_tag_data = redis_client.hget("physical:linucb:register_user_tag_info", user_id)