自动抽题-自建加共享
This commit is contained in:
parent
912c4ec1ba
commit
e01108df66
|
@ -94,7 +94,7 @@
|
|||
|
||||
})
|
||||
$("#tmfls").combotree({
|
||||
url: 'api/questioncat?a=tree3',
|
||||
url: 'api/questioncat?a=tree4',
|
||||
method: 'get',
|
||||
multiple: true,
|
||||
loadFilter: function (rows) {
|
||||
|
|
|
@ -171,7 +171,12 @@
|
|||
<!-- <button type="hidden" id="getb" onclick="test()" /> -->
|
||||
|
||||
<script>
|
||||
|
||||
$.messager.show({
|
||||
title:'提示',
|
||||
msg:'每晚10点-11点为维护时间,请尽量不在此时间使用',
|
||||
timeout:5000,
|
||||
showType:'slide'
|
||||
});
|
||||
var openid = $('#userindex').attr('openid');
|
||||
var nickname = $('#userindex').attr('nickname');
|
||||
var headimgurl = $('#userindex').attr('headimgurl');
|
||||
|
|
|
@ -6673,6 +6673,18 @@ def apiquestioncat(req):
|
|||
parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
|
||||
return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
|
||||
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()
|
||||
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, isopen=1).annotate(
|
||||
parentId=F('parent__id')).values('id', 'parentId', 'name', 'isopen')
|
||||
return HttpResponse(json.dumps(list(list_items)), content_type="application/json")
|
||||
elif a == 'tree4':
|
||||
# 自建+共享分类
|
||||
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()
|
||||
if companys:
|
||||
|
@ -6680,7 +6692,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=1, deletemark=1, isopen=1)).annotate(
|
||||
usecomp__partid=companyid, 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':
|
||||
|
|
Loading…
Reference in New Issue