From 2487262142e32ead1f69d95d7cb834a22fe1f043 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 23 Nov 2020 22:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8A=BD=E9=A2=98=E6=97=B6?= =?UTF-8?q?=E6=9C=89=E9=BB=98=E8=AE=A4=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/safesite/views.py b/safesite/views.py index 827c157b..f5f83bba 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6697,7 +6697,7 @@ def apiquestioncat(req): else: companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True) list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1, isopen=1)| Questioncat.objects.filter( - usecomp__partid=companyid, deletemark=1)).distinct().annotate( + usecomp__partid__in=[companyid,1], deletemark=1)).distinct().annotate( parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen') return HttpResponse(json.dumps(list(list_items)), content_type="application/json") elif a == 'tree':