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

.idea/codeStyles/Project.xml

@@ -24,29 +24,5 @@
         <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
       </formatting-settings>
     </DBN-SQL>
-    <DBN-PSQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false" />
-    </DBN-PSQL>
-    <DBN-SQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false">
-        <option name="STATEMENT_SPACING" value="one_line" />
-        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
-        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
-      </formatting-settings>
-    </DBN-SQL>
   </code_scheme>
 </component>
\ No newline at end of file

search/utils/topic.py

@@ -477,7 +477,7 @@ class TopicUtils(object):
                 "query": {
                     "bool": {
                         "must": [
-                            {"range": {"content_level": {"gte": 5, "lte": 6}}},
+                            {"range": {"content_level": {"gte": 3, "lte": 6}}},
                             {"term": {"is_online": True}},
                             {"term": {"is_deleted": False}}
                         ],
@@ -514,13 +514,13 @@ class TopicUtils(object):
                 }
 
             if len(topic_tag_list) > 0:
-                query_function_score["query"]["bool"]["should"] = {
+                query_function_score["query"]["bool"]["filter"] = {
                     "terms": {
                         "tag_list": topic_tag_list
                     }
                 }
             if topic_user_id != -1:
-                query_function_score["query"]["bool"]["must"] += {
+                query_function_score["query"]["bool"]["filter"] = {
                     "term": {
                         "user_id": topic_user_id
                     }