From b0b32dd23e9805e34f06414f818a7381ae82a0fd Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 25 Oct 2019 11:29:47 +0800
Subject: [PATCH 1/2] groupmodel2

---
 safesite/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/safesite/views.py b/safesite/views.py
index f4628577..2a3d7a98 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -4724,7 +4724,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)

From 9c0d91c14845e40c9b9c1f4213941aea1274feda Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 28 Oct 2019 08:14:31 +0800
Subject: [PATCH 2/2] partment del

---
 Pipfile           | 11 -----------
 safesite/daoru.py |  2 +-
 safesite/views.py |  5 ++---
 3 files changed, 3 insertions(+), 15 deletions(-)
 delete mode 100644 Pipfile

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 2a3d7a98..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') != '':