From c0131e1c604f7406913cfe95cc51101acba94450 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 23 Nov 2020 17:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=87=AA=E5=B7=B1=E7=9A=84=E5=85=AC=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/daoru.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/safesite/daoru.py b/safesite/daoru.py index 7d6822ec..3685203e 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -84,15 +84,11 @@ def drquestions(companyid,path,userid): right = sheet['j'+str(i)].value.replace(' ', '') resolution = sheet['k'+str(i)].value level = sheet['l'+str(i)].value - objs = Questioncat.objects.filter(usecomp__partid=1,name=cate,deletemark=1) + objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate,deletemark=1) if objs.exists(): cateobj = objs[0] else: - objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate,deletemark=1) - if objs.exists(): - cateobj = objs[0] - else: - cateobj = Questioncat.objects.create(usecomp=Partment.objects.get(partid=companyid),name=cate) + cateobj = Questioncat.objects.create(usecomp=Partment.objects.get(partid=companyid),name=cate) if type == '单选': if Question.objects.filter(type=1,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').exists(): Question.objects.filter(type=1,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').update(nousecomps='', questioncat=cateobj)