diff --git a/safesite/views.py b/safesite/views.py index dcfc2eba..14c5b291 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -556,8 +556,11 @@ def init_permission(user,req): menus = user.usecomp.role.permissions.all() else: bgroups = user.userg.filter(usecomp=user.usecomp) #所属公司的用户组 - for i in bgroups: - x.extend(i.menulist) + + if bgroups: + for i in bgroups: + if i.menulist: + x.extend(i.menulist) menus = Menu.objects.exclude(menuid__in=[11, 9]).filter(menuid__in=list(set(x)), deletemark=1) for item in menus: permission_dict[item.menucode] = ({ @@ -6950,6 +6953,8 @@ def apirisk(req): return JsonResponse({'code': 1, 'steps': list(objs.values('id', 'step', 'hazard', 'result', 'level', 'riskact__group__groupname', 'riskact__zrbm__partname', 'riskact__zrr__name'))}) else: return JsonResponse({'code': 0}) + + elif a == 'del': id = req.GET.get('id') user = User.objects.get(userid=userid) @@ -8031,7 +8036,7 @@ def checkprojects(req): elif a == 'del': id =req.GET.get('id') a = Checktask.objects.get(id=id) - if a.createuser==User.objects.get(userid=userid): + if User.objects.get(userid=userid).issuper == 1: a.deletemark=0 a.save() return JsonResponse({"code":1}) @@ -8054,7 +8059,7 @@ def checkprojects(req): elif a == 'deltab': id =req.GET.get('id') a = Checktable.objects.get(id=id) - if a.createuser==User.objects.get(userid=userid): + if User.objects.get(userid=userid).issuper == 1: a.deletemark=0 a.save() return JsonResponse({"code":1}) @@ -8066,7 +8071,7 @@ def checkprojects(req): elif a == 'deljob': id =req.GET.get('id') a = Checkjob.objects.get(id=id) - if a.createuser==User.objects.get(userid=userid): + if User.objects.get(userid=userid).issuper == 1: a.deletemark=0 a.save() return JsonResponse({"code":1})