add

search/views/group.py

@@ -116,10 +116,30 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
             for item in result_dict["hits"]:
                 pict_pictorial_ids_list = item["_source"]["pictorial_id"]
                 topic_tag_list = item["_source"]["tag_list"]
+
             q["query"] = {
-                "terms": {
-                    "id": pict_pictorial_ids_list
+                "bool": {
+                    "must": [{
+                        "terms": {
+                            "id": pict_pictorial_ids_list
+                        }
+
+                    },
+                        {
+                            "term": {
+                                "is_online": True
+                            }
+
+                        },
+                        {
+                            "term": {
+                                "is_deleted": False
+                            }
+
+                        },
+                    ]
                 }
+
             }
             q["_source"] = {
                 "include": ["id", "update_time"]
@@ -138,8 +158,8 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
         logging.info("get pictorial_id_list:%s" % pictorial_id_list)
         logging.info("get topic_tag_list:%s" % topic_tag_list)
 
-        if len(pict_pictorial_ids_list) < 10:
-            num = 10-len(pict_pictorial_ids_list)
+        if len(pictorial_id_list) < 10:
+            num = 10 - len(pictorial_id_list)
             q["query"] = {
                 "bool": {
                     "must": [{
@@ -164,16 +184,18 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
                     'order': 'desc'
 
                 }}
-        q["from"] = 0
-        q["size"] = num
+            q["from"] = 0
+            q["size"] = num
 
-        result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size)
-        if len(result_dict["hits"]) > 0:
-            pictorial_id_list.append(item["_source"]["id"] for item in result_dict["hits"])  #
+            result_dict = ESPerform.get_search_results(es_cli_obj, "pictorial", q, offset, size)
+
+            if len(result_dict["hits"]) > 0:
+                pictorial_id_list.append(item["_source"]["id"] for item in result_dict["hits"])  #
 
-            logging.info("get result_dict tag:%s" % result_dict)
+                logging.info("get result_dict tag:%s" % result_dict)
+                logging.info("get pictorial_id_list tag:%s" % pictorial_id_list)
 
-            return {"pictorial_ids_list": pictorial_id_list}
+                return {"pictorial_ids_list": pictorial_id_list}
 
         else:
             return {"pictorial_ids_list": pictorial_id_list}