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)