add

search/views/group.py

@@ -162,19 +162,11 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
             num = 10 - len(pictorial_id_list)
             q["query"] = {
                 "bool": {
-                    "must": [{
-                        "term": {
-                            "is_online": True}
-                    },
-                        {"term": {
-                            "is_delete": False}
-                        },
-                        {"terms": {
-                            "tag_id":  topic_tag_list
+                    "must": {
+                        "terms": {
+                            "tag_id": topic_tag_list
                         }}
-                    ]
                 }
-
             }
             q["_source"] = {
                 "include": ["id", "tag_id"]}
@@ -189,22 +181,22 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
             result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size)
 
             if len(result_dict["hits"]) > 0:
-                for item in result_dict["hits"]:
-                    id = item["_source"]["id"]
-                    if id not in pictorial_id_list:
-                        pictorial_id_list.append(id)  #
+                for
+            item in result_dict["hits"]:
+            id = item["_source"]["id"]
+            if id not in pictorial_id_list:
+                pictorial_id_list.append(id)  #
 
             logging.info("get result_dict tag:%s" % result_dict)
             logging.info("get pictorial_id_list tag:%s" % pictorial_id_list)
 
             pictorial_list = pictorial_id_list if len(pictorial_id_list) < 10 else pictorial_id_list[:10]
 
-            return {"pictorial_ids_list": pictorial_list}
-
-        else:
-            return {"pictorial_ids_list": pictorial_id_list}
+        return {"pictorial_ids_list": pictorial_list}
 
+    else:
+    return {"pictorial_ids_list": pictorial_id_list}
 
-    except:
-        logging.error("catch exception,err_msg:%s" % traceback.format_exc())
-        return {"pictorial_ids_list": []}
+except:
+logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+return {"pictorial_ids_list": []}