github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-26 06:52:53 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复一些 Root 组织没数据的问题

Browse Source
This commit is contained in:
xinwen 2021-03-18 16:44:32 +08:00 committed by Jiangjie.Bai
parent 33952b2333
commit b597cfcd19
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/assets/api/system_user_relation.py
View File

@ -19,9 +19,10 @@ __all__ = [
class RelationMixin: class RelationMixin:
def get_queryset(self): def get_queryset(self):
queryset = self.model.objects.all() queryset = self.model.objects.all()
org_id = current_org.org_id() if not current_org.is_root():
if org_id is not None: org_id = current_org.org_id()
queryset = queryset.filter(systemuser__org_id=org_id) queryset = queryset.filter(systemuser__org_id=org_id)
queryset = queryset.annotate(systemuser_display=Concat( queryset = queryset.annotate(systemuser_display=Concat(
F('systemuser__name'), Value('('), F('systemuser__username'), F('systemuser__name'), Value('('), F('systemuser__username'),
Value(')') Value(')')

2
apps/assets/backends/db.py
View File

@ -165,7 +165,7 @@ class SystemUserBackend(DBBackend):
kwargs = self.get_annotate() kwargs = self.get_annotate()
filters = self.get_filter() filters = self.get_filter()
qs = self.model.objects.all().annotate(**kwargs) qs = self.model.objects.all().annotate(**kwargs)
if current_org.org_id() is not None: if not current_org.is_root():
filters['org_id'] = current_org.org_id() filters['org_id'] = current_org.org_id()
qs = qs.filter(**filters) qs = qs.filter(**filters)
qs = self.qs_to_values(qs) qs = self.qs_to_values(qs)

4
apps/orgs/mixins/api.py
View File

@ -70,7 +70,7 @@ class OrgBulkModelViewSet(CommonApiMixin, OrgViewSetMixin, BulkModelViewSet):
class OrgRelationMixin(RelationMixin): class OrgRelationMixin(RelationMixin):
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
org_id = current_org.org_id() if not current_org.is_root():
if org_id is not None: org_id = current_org.org_id()
queryset = queryset.filter(**{f'{self.from_field}__org_id': org_id}) queryset = queryset.filter(**{f'{self.from_field}__org_id': org_id})
return queryset return queryset