From 89ec6ba6ef64df8476b0d3eea417f9904493f7aa Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 3 Dec 2020 10:41:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Node=20ordering=20[`parent=5Fkey`,=20`va?=
 =?UTF-8?q?lue`];=20=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?Default=E8=8A=82=E7=82=B9=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98(?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8key=E4=B8=BA0=E7=9A=84Default=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/models/node.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py
index da8d07ebc..f8d5f9691 100644
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -354,7 +354,8 @@ class SomeNodesMixin:
     def org_root(cls):
         root = cls.objects.filter(parent_key='')\
             .filter(key__regex=r'^[0-9]+$')\
-            .exclude(key__startswith='-')
+            .exclude(key__startswith='-')\
+            .order_by('key')
         if root:
             return root[0]
         else:
@@ -411,7 +412,7 @@ class Node(OrgModelMixin, SomeNodesMixin, FamilyMixin, NodeAssetsMixin):
 
     class Meta:
         verbose_name = _("Node")
-        ordering = ['value']
+        ordering = ['parent_key', 'value']
 
     def __str__(self):
         return self.full_value