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

Merge pull request #6405 from jumpserver/dev 

v2.12.0 rc1
pull/6468/head
Jiangjie.Bai 2021-07-08 16:55:46 +08:00 committed by GitHub
parent d6c2705bd6 f8f7ac0af5
commit bcf90d71a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/assets/signals_handler/asset.py
View File

@ -84,8 +84,8 @@ def on_asset_nodes_add(instance, action, reverse, pk_set, **kwargs):
# 查询所有已存在的关系
m2m_model = SystemUser.assets.through
exist = set(m2m_model.objects.filter(
system_user_id__in=system_user_ids, asset_id__in=asset_ids
).values_list('system_user_id', 'asset_id'))
systemuser_id__in=system_user_ids, asset_id__in=asset_ids
).values_list('systemuser_id', 'asset_id'))
# TODO 优化
to_create = []
for system_user_id in system_user_ids:
@ -95,7 +95,7 @@ def on_asset_nodes_add(instance, action, reverse, pk_set, **kwargs):
continue
asset_ids_to_push.append(asset_id)
to_create.append(m2m_model(
system_user_id=system_user_id,
systemuser_id=system_user_id,
asset_id=asset_id
))
if asset_ids_to_push: