zcdsj
/
safesite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

无集团共享分类不显示;tree无限重复bug

This commit is contained in:
caoqianming 2020-11-11 10:31:18 +08:00
parent 9a4a71b152
commit 1c597970ff
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
safesite/static/safesite/mystatic/js/util.js
View File

@ -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; return nodes;
} }
//关闭dialog-dd //关闭dialog-dd

9
safesite/views.py
View File

@ -6577,11 +6577,12 @@ def apiquestioncat(req):
elif a == 'tree3': elif a == 'tree3':
groups = g_models.Groupmember.objects.filter(member__partid=companyid).values_list('group__id', flat=True) 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() companys = g_models.Groupmember.objects.filter(group__id__in=groups).values_list('member__partid', flat=True).distinct()
list_items = [] if companys:
for i in companys: pass
list_item = (Questioncat.objects.filter(usecomp=i, deletemark=1)).annotate( 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') parentId=F('parent__id')).values('id', 'parentId', 'name')
list_items.extend(list_item)
return HttpResponse(json.dumps(list(list_items)), content_type="application/json") return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
elif a == 'tree': elif a == 'tree':
list_items = (Questioncat.objects.filter(usecomp__partid=1, deletemark=1) | Questioncat.objects.filter( list_items = (Questioncat.objects.filter(usecomp__partid=1, deletemark=1) | Questioncat.objects.filter(