From 26c3409d844d2fd293b2923730858dc258a7928b Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 22 Sep 2023 15:05:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=95=B0=E9=87=8F=E6=96=B9=E6=B3=95=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 139295f69..d4fc8165d 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -402,12 +402,7 @@ class NodeAssetsMixin(NodeAllAssetsMappingMixin): return Asset.objects.filter(q).distinct() def get_assets_amount(self): - q = Q(node__key__startswith=f'{self.key}:') | Q(node__key=self.key) - return self.assets.through.objects.filter(q).count() - - def get_assets_account_by_children(self): - children = self.get_all_children().values_list() - return self.assets.through.objects.filter(node_id__in=children).count() + return self.get_all_assets().count() @classmethod def get_node_all_assets_by_key_v2(cls, key):