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':