Merge pull request #5032 from jumpserver/dev

fix(assets): 修复获取org_root的问题
2020-11-18 11:29:53 +08:00 · 2020-11-18 11:29:53 +08:00 · 177055acdc
parent 49dd611292 6ec0b3ad54
commit 177055acdc
1 changed files with 3 additions and 1 deletions
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@ -352,7 +352,9 @@ class SomeNodesMixin:

    @classmethod
    def org_root(cls):
-        root = cls.objects.filter(parent_key='').exclude(key__startswith='-')
+        root = cls.objects.filter(parent_key='')\
+            .filter(key__regex=r'^[0-9]+$')\
+            .exclude(key__startswith='-')
        if root:
            return root[0]
        else: