github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 分页后排序失效

pull/12530/head
feng 2024-01-11 22:38:01 +08:00 committed by 老广
parent bab5b67c52
commit 311c01242b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/api/mixin.py
View File

@ -104,9 +104,11 @@ class QuerySetMixin:
page = super().paginate_queryset(queryset) page = super().paginate_queryset(queryset)
serializer_class = self.get_serializer_class() serializer_class = self.get_serializer_class()
if page and serializer_class and hasattr(serializer_class, 'setup_eager_loading'): if page and serializer_class and hasattr(serializer_class, 'setup_eager_loading'):
ids = [i.id for i in page] ids = [str(obj.id) for obj in page]
page = self.get_queryset().filter(id__in=ids) page = self.get_queryset().filter(id__in=ids)
page = serializer_class.setup_eager_loading(page) page = serializer_class.setup_eager_loading(page)
page_mapper = {str(obj.id): obj for obj in page}
page = [page_mapper.get(_id) for _id in ids if _id in page_mapper]
return page return page