From 6dc4519c7807ec95d674c53fd3d0079731ce2adc Mon Sep 17 00:00:00 2001 From: Bai Date: Tue, 17 Jan 2023 13:40:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=A0=91=20=E8=8E=B7=E5=8F=96=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=88=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E7=BB=84=E7=BB=87=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/tree.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/assets/api/tree.py b/apps/assets/api/tree.py index dcbc191d8..346775069 100644 --- a/apps/assets/api/tree.py +++ b/apps/assets/api/tree.py @@ -137,7 +137,8 @@ class NodeChildrenAsTreeApi(SerializeToTreeNodeMixin, NodeChildrenApi): nodes = self.filter_queryset(self.get_queryset()).order_by('value') nodes = self.serialize_nodes(nodes, with_asset_amount=True) assets = self.filter_queryset_for_assets(self.get_queryset_for_assets()) - assets = self.serialize_assets(assets, self.instance.key) + node_key = self.instance.key if self.instance else None + assets = self.serialize_assets(assets, node_key=node_key) data = [*nodes, *assets] return Response(data=data)