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

search/utils/topic.py

@@ -579,7 +579,7 @@ class TopicUtils(object):
         f = [
             {"term": {"is_deleted": False}},
         ]
-        _range = {}
+
         if not filters:
             return f
 
@@ -592,10 +592,31 @@ class TopicUtils(object):
 
                 if k == "create_time_gte":
                     op = "gte"
-                    _range.update({op:v})
                 elif k == "create_time_lte":
                     op = "lte"
-                    _range.update({op: v})
+
+                f.append({
+                    "range": {
+                        "create_time_val": {
+                            op: v,
+                        }
+                    }
+                })
+
+            elif k in ["id_gte", "id_lte"]:
+
+                if k == "id_gte":
+                    op = "gte"
+                elif k == "id_lte":
+                    op = "lte"
+
+                f.append({
+                    "range": {
+                        "id": {
+                            op: v,
+                        }
+                    }
+                })
             else:
                 if isinstance(v, list):
                     f.append({
@@ -605,7 +626,7 @@ class TopicUtils(object):
                     f.append({
                         "term": {k: v},
                     })
-        f.append({"range": {"create_time_val": _range}})
+
         if filter_online:
             f.append({"term": {"is_online": True}})