Merge pull request #985 from Bidaya0/bugfix/aggr_vul_fix-part4

bugfix/aggr_vul_fix-part4
HXSecurity · Sep 23, 2022 · d6b1410 · d6b1410
2 parents cbf51d8 + 06d9db7
commit d6b1410
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/dongtai_web/aggr_vul/aggr_vul_list.py b/dongtai_web/aggr_vul/aggr_vul_list.py
@@ -196,22 +196,23 @@ def post(self, request):
             else:
                 new_order = new_order + ", vul.update_time_desc"
 
-        if keywords:
-            all_vul = IastAssetVul.objects.raw(
-                query_base + "  order by score desc, %s limit %s,%s;  " %
-                (new_order, begin_num, end_num), [keywords])
-        else:
-            all_vul = IastAssetVul.objects.raw(
-                query_base + "  order by %s  limit %s,%s;  " %
-                (new_order, begin_num, end_num))
-        all_vul = IastAssetVul.objects.filter(
-            pk__in=[vul.id for vul in all_vul]).all()
         if ELASTICSEARCH_STATE:
             all_vul = get_vul_list_from_elastic_search(
                 request.user.id,
                 page_size=ser.validated_data['page_size'],
                 page=ser.validated_data['page'],
                 **es_query)
+        else:
+            if keywords:
+                all_vul = IastAssetVul.objects.raw(
+                    query_base + "  order by score desc, %s limit %s,%s;  " %
+                    (new_order, begin_num, end_num), [keywords])
+            else:
+                all_vul = IastAssetVul.objects.raw(
+                    query_base + "  order by %s  limit %s,%s;  " %
+                    (new_order, begin_num, end_num))
+            all_vul = IastAssetVul.objects.filter(
+                pk__in=[vul.id for vul in all_vul]).all()
         content_list = []
 
         if all_vul: