diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 9c7ae7bd..00000000 --- a/Pipfile +++ /dev/null @@ -1,11 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] - -[requires] -python_version = "3.5" diff --git a/safesite/daoru.py b/safesite/daoru.py index 703c23fd..2dace7f4 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -268,7 +268,7 @@ def drusers(companyid,path): wb = load_workbook(path) sheet = wb.worksheets[0] partdict = {} - groupdict = {} + # groupdict = {} userdict = {} parts = Partment.objects.filter(partlink__contains=',' + companyid + ',')|Partment.objects.filter(partid=companyid) #获取所有部门 for i in parts: diff --git a/safesite/views.py b/safesite/views.py index f4628577..fc5816b2 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -2215,11 +2215,10 @@ def parthandle(req): return HttpResponse(json.dumps(b,cls=MyEncoder),content_type="application/json") elif req.GET.get('a')=='del': a = req.POST.get('partid') - if Partment.objects.filter(partlink__contains=','+a+',') or User.objects.filter(ubelongpart=a): + if Partment.objects.filter(partlink__contains=','+a+',').exists() or User.objects.filter(ubelongpart=a).exists(): return JsonResponse({"code":0}) else: - a = Partment.objects.get(partid=a) - a.delete() + Partment.objects.get(partid=a).delete() return JsonResponse({"code":1}) elif req.GET.get('a')=='addpart': if req.POST.get('partid') != '': @@ -4724,7 +4723,8 @@ def apiquestion(req): elif a == 'exercise': data = json.loads(req.body.decode('utf-8')) x = Question.objects.filter(deletemark=1) - a = (x.filter(usecomps__contains=',1,')|x.filter(usecomps__contains=','+companyid+',')).exclude(nousecomps__contains=','+companyid+',') + #a = (x.filter(usecomps__contains=',1,')|x.filter(usecomps__contains=','+companyid+',')).exclude(nousecomps__contains=','+companyid+',') + a = x.exclude(nousecomps__contains=','+companyid+',') tmlxs = data['tmlx'] ydtms = data['ydtms'] a = x.filter(questioncat__id__in=tmlxs).exclude(id__in=ydtms)