mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-16 15:28:38 +00:00
fix: Got perm tree 500 (#13533)
Co-authored-by: feng <1304903146@qq.com>
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
import time
|
||||
from collections import defaultdict
|
||||
from uuid import UUID
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.cache import cache
|
||||
from django.db import transaction
|
||||
from django.db.models import F
|
||||
|
||||
from assets.models import Asset
|
||||
from assets.utils import NodeAssetsUtil
|
||||
from common.db.models import output_as_string
|
||||
from common.decorators import merge_delay_run
|
||||
from common.decorators import on_transaction_commit
|
||||
from common.utils import get_logger
|
||||
@@ -399,11 +398,11 @@ class UserPermTreeBuildUtil(object):
|
||||
asset_node_pairs = Asset.nodes.through.objects \
|
||||
.filter(asset_id__in=self.direct_asset_ids) \
|
||||
.annotate(
|
||||
str_asset_id=output_as_string('asset_id'),
|
||||
str_node_id=output_as_string('node_id')
|
||||
str_asset_id=F('asset_id'),
|
||||
str_node_id=F('node_id')
|
||||
).values_list('str_asset_id', 'str_node_id')
|
||||
asset_node_pairs = [
|
||||
(str(UUID(asset_id)), str(UUID(node_id)))
|
||||
(str(asset_id), str(node_id))
|
||||
for asset_id, node_id in asset_node_pairs
|
||||
]
|
||||
return asset_node_pairs
|
||||
|
Reference in New Issue
Block a user