github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-06 18:00:57 +00:00
Code Issues Projects Releases Wiki Activity

fix(ticket): 修改工单获取系统用户的字段 (#4274)

Browse Source 
fix(ticket): 申请资产工单修改bug
This commit is contained in:
xinwen
2020-07-09 14:06:06 +08:00
committed by GitHub
parent f430c9e435
commit 8eb6cfa9c9
6 changed files with 102 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/users/filters.py
View File

@@ -1,6 +1,7 @@
from rest_framework.compat import coreapi, coreschema
from rest_framework import filters
from users.models.user import User
from orgs.utils import current_org
@@ -11,7 +12,7 @@ class OrgRoleUserFilterBackend(filters.BaseFilterBackend):
return queryset
if org_role == 'admins':
return queryset & current_org.get_org_admins()
return queryset & (current_org.get_org_admins() | User.objects.filter(role=User.ROLE_ADMIN))
elif org_role == 'auditors':
return queryset & current_org.get_org_auditors()
elif org_role == 'users':