github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 账号授权过滤指定账号api 失效问题

pull/11731/head
feng 2023-09-27 14:13:06 +08:00 committed by Bryan
parent 1e0489bb96
commit 6a54ff8714
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/accounts/api/account/account.py
View File

@ -61,22 +61,14 @@ class AccountViewSet(OrgBulkModelViewSet):
node_ids = request.data.get('nodes', []) node_ids = request.data.get('nodes', [])
username = request.data.get('username', '') username = request.data.get('username', '')
if not asset_ids and not node_ids:
accounts = Account.objects.all() accounts = Account.objects.all()
else:
node_asset_ids = []
if node_ids: if node_ids:
nodes = Node.objects.filter(id__in=node_ids) nodes = Node.objects.filter(id__in=node_ids)
node_asset_ids = Node.get_nodes_all_assets(*nodes).values_list('id', flat=True) node_asset_ids = Node.get_nodes_all_assets(*nodes).values_list('id', flat=True)
asset_ids.extend(node_asset_ids) asset_ids.extend(node_asset_ids)
asset_ids = list(set(asset_ids))
if not asset_ids: if asset_ids:
accounts = Account.objects.all() accounts = accounts.filter(asset_id__in=list(set(asset_ids)))
else:
accounts = Account.objects.filter(asset_id__in=asset_ids)
if username: if username:
accounts = accounts.filter(username__icontains=username) accounts = accounts.filter(username__icontains=username)