Merge pull request #1602 from jumpserver/bai_org

[Bugfix] 修复org下用户查看我的资产不显示已授权节点/资产的bug

apps/assets/models/node.py

@@ -114,7 +114,7 @@ class Node(OrgModelMixin):
         args = []
         kwargs = {}
         if self.is_default_node():
-            args.append(Q(nodes__key__regex=pattern) | Q(nodes__key=None))
+            args.append(Q(nodes__key__regex=pattern) | Q(nodes=None))
         else:
             kwargs['nodes__key__regex'] = pattern
         assets = Asset.objects.filter(*args, **kwargs)

apps/perms/api.py

@@ -101,6 +101,7 @@ class UserGrantedNodesApi(ListAPIView):
         return nodes.keys()
 
     def get_permissions(self):
+        set_current_org(Organization.root())
         if self.kwargs.get('pk') is None:
             self.permission_classes = (IsValidUser,)
         return super().get_permissions()
@@ -157,6 +158,7 @@ class UserGrantedNodeAssetsApi(ListAPIView):
         return assets
 
     def get_permissions(self):
+        set_current_org(Organization.root())
         if self.kwargs.get('pk') is None:
             self.permission_classes = (IsValidUser,)
         return super().get_permissions()