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