Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test

search/utils/topic.py

@@ -526,9 +526,10 @@ class TopicUtils(object):
                     }
                 }
             q["query"]["function_score"] = query_function_score
-            q["collapse"] = {
+            if topic_user_id == -1:
+              q["collapse"] = {
                 "field": "user_id"
-            }
+              }
             q["_source"] = {
                 "includes": ["id", "pictorial_id", "user_id", "_score"]
             }