From de247b00f09b60878251f7c6f95c6677a84546dc Mon Sep 17 00:00:00 2001
From: yangjian <zmister@qq.com>
Date: Tue, 29 Dec 2020 22:11:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=99=E7=82=B9=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E7=A7=81=E5=AF=86=E6=96=87=E9=9B=86=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=B8=B8=E5=AE=A2=E5=8F=AF=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=88=B0=E7=A7=81=E5=AF=86=E6=96=87=E9=9B=86=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_doc/views_search.py | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/app_doc/views_search.py b/app_doc/views_search.py
index 208812e..f1ea314 100644
--- a/app_doc/views_search.py
+++ b/app_doc/views_search.py
@@ -66,16 +66,26 @@ class DocSearchView(SearchView):
             view_list = list(set(open_list).union(set(colla_list)))  # 合并上述两个文集ID列表
         else:
             view_list = [i.id for i in Project.objects.filter(role=0)] # 公开文集
-
-        sqs = SearchQuerySet().filter(
-            top_doc__in=view_list
-        ).filter(
-            modify_time__gte=start_date,
-            modify_time__lte=end_date).order_by('-modify_time')
-        self.form = self.build_form(form_kwargs={'searchqueryset':sqs})
-        self.query = self.get_query()
-        self.results = self.get_results()
-        return self.create_response()
+        if len(view_list) > 0:
+            sqs = SearchQuerySet().filter(
+                top_doc__in=view_list
+            ).filter(
+                modify_time__gte=start_date,
+                modify_time__lte=end_date).order_by('-modify_time')
+            self.form = self.build_form(form_kwargs={'searchqueryset':sqs})
+            self.query = self.get_query()
+            self.results = self.get_results()
+            return self.create_response()
+        else:
+            sqs = SearchQuerySet().filter(
+                top_doc__in=None
+            ).filter(
+                modify_time__gte=start_date,
+                modify_time__lte=end_date).order_by('-modify_time')
+            self.form = self.build_form(form_kwargs={'searchqueryset': sqs})
+            self.query = self.get_query()
+            self.results = self.get_results()
+            return self.create_response()
 
     def extra_context(self):
         context = {