From 165156aff1fa7f705b48e09e4742b6e52c898e9e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 11 Oct 2022 17:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=AF=BC=E5=85=A5=E6=98=AF?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=A2=98=E7=9B=AE=E5=A2=9E=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- safesite/daoru.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/safesite/daoru.py b/safesite/daoru.py index d8ef2c48..aba49c70 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -108,8 +108,8 @@ def drquestions(companyid,path,userid): else: 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) + if Question.objects.filter(questioncat=cateobj, type=1,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').exists(): + pass else: if right in ['A','B','C','D','E','F']: obj = Question() @@ -128,8 +128,8 @@ def drquestions(companyid,path,userid): obj.save() elif type == '多选': right = list(right) - if Question.objects.filter(type=2,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').exists(): - Question.objects.filter(type=2,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').update(nousecomps='', questioncat=cateobj) + if Question.objects.filter(questioncat=cateobj, type=2,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').exists(): + pass else: if [False for c in right if c not in qlist]: pass @@ -153,8 +153,8 @@ def drquestions(companyid,path,userid): right = 'A' else: right = 'B' - if Question.objects.filter(type=3,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').exists(): - Question.objects.filter(type=3,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').update(nousecomps='', questioncat=cateobj) + if Question.objects.filter(questioncat=cateobj, type=3,title=title,right=right,deletemark=1,usecomps = ','+companyid+',').exists(): + pass else: obj = Question() obj.type = 3