From 9706bd0c43eaa66e145f9f98df8365f2ee602619 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 27 Jul 2021 08:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E7=90=86=E5=8C=96=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=AF=BC=E5=87=BA=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/views.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/safesite/views.py b/safesite/views.py
index 863a38cd..0539f578 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -4856,10 +4856,20 @@ def apisuggest(req):
         companyid = getcompany(userid)
         a = Suggest.objects.filter(
             usecomp=Partment.objects.get(partid=companyid))
+        if req.GET.get('jyr', None):
+            a = a.filter(jyr__userid=req.GET.get('jyr'))
+        if req.GET.get('clr', None):
+            a = a.filter(clr__userid=req.GET.get('clr'))
         if req.GET.get('qssj'):
-            a = a.filter(jyrq__gte=req.GET.get('qssj'))
+            a = a.filter(submittime__gte=req.GET.get('qssj'))
         if req.GET.get('jssj'):
-            a = a.filter(jyrq__lte=req.GET.get('jssj'))
+            a = a.filter(submittime__lte=req.GET.get('jssj'))
+        if req.GET.get('jyrname', None):
+            a = a.filter(jyr__name__contains=req.GET.get('jyrname'))
+        if req.GET.get('jybm'):
+            parts = Partment.objects.filter(partlink__contains=','+req.GET.get(
+                'jybm')+',') | Partment.objects.filter(partid=req.GET.get('jybm'))
+            a = a.filter(jybm__in=parts)
         res = exportxlsx('jy', a)
         return res
     elif a == 'exportword':