[Update] 修改节点生成规则

apps/assets/models/node.py

@@ -203,12 +203,14 @@ class Node(OrgModelMixin):
         # 如果使用current_org 在set_current_org时会死循环
         _current_org = get_current_org()
         with transaction.atomic():
-            if _current_org.is_default():
+            if _current_org.is_root():
                 key = '0'
+            elif _current_org.is_default():
+                key = '1'
             else:
                 set_current_org(Organization.root())
                 org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$')
-                org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or [0]
+                org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1']
                 key = str(max([int(k) for k in org_nodes_roots_keys]) + 1)
                 set_current_org(_current_org)
             root = cls.objects.create(key=key, value=_current_org.name)
@@ -225,7 +227,7 @@ class Node(OrgModelMixin):
     @classmethod
     def default_node(cls):
         defaults = {'value': 'Default'}
-        return cls.objects.get_or_create(defaults=defaults, key='0')
+        return cls.objects.get_or_create(defaults=defaults, key='1')
 
     @classmethod
     def get_tree_name_ref(cls):

apps/assets/views/asset.py

@@ -45,9 +45,6 @@ class AssetListView(AdminUserRequiredMixin, TemplateView):
     template_name = 'assets/asset_list.html'
 
     def get_context_data(self, **kwargs):
-        if current_org.is_default():
-            Node.default_node()
-        else:
         Node.root()
         context = {
             'app': _('Assets'),