From 08d344c2b54a38e31ffbed828bf4273087ef34d7 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Thu, 19 Sep 2019 14:34:13 +0800 Subject: [PATCH 1/2] jy --- safesite/edu/views.py | 6 +++++- safesite/templates/edulessonadd.html | 2 +- safesite/templates/edulessonaddwj.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/safesite/edu/views.py b/safesite/edu/views.py index 7e9ad472..62d5bfd3 100644 --- a/safesite/edu/views.py +++ b/safesite/edu/views.py @@ -119,13 +119,17 @@ def api(req): elif a == 'del': id =req.GET.get('id') userid = req.session['userid'] + companyid = getcompany(userid)#公司ID a = Edulesson.objects.get(id=id) - if User.objects.get(userid = userid).issuper == 1: + if a.usecomp==Partment.objects.get(partid=companyid): a.deletemark=0 a.save() return JsonResponse({"code":1}) + else: + return JsonResponse({"code":0}) + #点击阅读 elif a=='readnumber': id =req.GET.get('id') diff --git a/safesite/templates/edulessonadd.html b/safesite/templates/edulessonadd.html index 65abdc09..d02db6bf 100644 --- a/safesite/templates/edulessonadd.html +++ b/safesite/templates/edulessonadd.html @@ -120,7 +120,7 @@ 所属类别： - diff --git a/safesite/templates/edulessonaddwj.html b/safesite/templates/edulessonaddwj.html index fb2c35fa..ea8b8a15 100644 --- a/safesite/templates/edulessonaddwj.html +++ b/safesite/templates/edulessonaddwj.html @@ -135,7 +135,7 @@ 所属类别： - From cf8a235156211c32cd331df7c2a0bf2464872336 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Thu, 19 Sep 2019 16:26:47 +0800 Subject: [PATCH 2/2] law --- safesite/rlt/views.py | 8 ++++---- safesite/templates/lawsadd.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/safesite/rlt/views.py b/safesite/rlt/views.py index dedc4aeb..332f0e9e 100644 --- a/safesite/rlt/views.py +++ b/safesite/rlt/views.py @@ -75,7 +75,7 @@ def lawstype(req): list_items = (Regulations.objects.filter(usecomp__partid=companyid,deletemark=1)).annotate(parentId=F('parent__id'),name=F('typename')).values('id','parentId','name') return HttpResponse(json.dumps(list(list_items)),content_type="application/json") elif a == 'tree': - list_items = (Regulations.objects.filter(usecomp__partid=1,deletemark=1)|Regulations.objects.filter(usecomp__partid=companyid,deletemark=1)).annotate(parentId=F('parent__id')).values('id','parentId','typename') + list_items = (Regulations.objects.filter(usecomp__partid=1,deletemark=1)|Regulations.objects.filter(usecomp__partid=companyid,deletemark=1)).annotate(parentId=F('parent__id'),name=F('typename')).values('id','parentId','name') return HttpResponse(json.dumps(list(list_items)),content_type="application/json") elif a == 'add': data = json.loads(req.body.decode('utf-8')) @@ -129,7 +129,7 @@ def lawstype(req): id = req.GET.get('id') user = User.objects.get(userid=userid) a = Regulations.objects.get(id=id) - if user.issuper==1 or a.usecomp.partid == companyid: + if a.usecomp==Partment.objects.get(partid=companyid): Regulations.objects.filter(id = id).update(deletemark=0) return JsonResponse({"code":1}) else: @@ -139,7 +139,7 @@ def lawstype(req): elif a == 'canedit': id = req.GET.get('id') a = Regulations.objects.get(id=id) - if a.usecomp == companyid or int(companyid)==1: + if a.usecomp==Partment.objects.get(partid=companyid): return JsonResponse({'code':1}) else: return JsonResponse({"code":0}) @@ -169,7 +169,7 @@ def lawstype(req): id =req.GET.get('id') userid = req.session['userid'] a = FileManage.objects.get(id=id) - if User.objects.get(userid = userid).issuper == 1: + if a.usecomp==Partment.objects.get(partid=companyid): a.deletemark=0 a.save() return JsonResponse({"code":1}) diff --git a/safesite/templates/lawsadd.html b/safesite/templates/lawsadd.html index 891ff5cb..e6bbf93e 100644 --- a/safesite/templates/lawsadd.html +++ b/safesite/templates/lawsadd.html @@ -99,7 +99,7 @@ 法律法规名称： - + @@ -113,7 +113,7 @@ 法律法规分类： -