From 1c597970ff2c21bd96638f9ddd50b4fc4176e6f3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 11 Nov 2020 10:31:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E9=9B=86=E5=9B=A2=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=B8=8D=E6=98=BE=E7=A4=BA;tree=E6=97=A0?= =?UTF-8?q?=E9=99=90=E9=87=8D=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/static/safesite/mystatic/js/util.js | 6 ++++++ safesite/views.py | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/safesite/static/safesite/mystatic/js/util.js b/safesite/static/safesite/mystatic/js/util.js index dd64b09f..11b27ea9 100644 --- a/safesite/static/safesite/mystatic/js/util.js +++ b/safesite/static/safesite/mystatic/js/util.js @@ -248,6 +248,12 @@ function convert(rows, x) { } } } + for (var i = 0; i < nodes.length; i++) { + var row = nodes[i]; + if(!row.children){ + row.state = 'open' + } + } return nodes; } //关闭dialog-dd diff --git a/safesite/views.py b/safesite/views.py index b1dec7bd..12fb5fa5 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6577,11 +6577,12 @@ def apiquestioncat(req): elif a == 'tree3': groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True) companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct() - list_items = [] - for i in companys: - list_item = (Questioncat.objects.filter(usecomp=i, deletemark=1)).annotate( - parentId=F('parent__id')).values('id', 'parentId', 'name') - list_items.extend(list_item) + if companys: + pass + else: + companys = Partment.objects.filter(partid=companyid).values_list('partid', flat=True) + list_items = (Questioncat.objects.filter(usecomp__in=companys, deletemark=1)).annotate( + parentId=F('parent__id')).values('id', 'parentId', 'name') return HttpResponse(json.dumps(list(list_items)), content_type="application/json") elif a == 'tree': list_items = (Questioncat.objects.filter(usecomp__partid=1, deletemark=1) | Questioncat.objects.filter(