Skip to content

Commit

Permalink
Merge pull request #328 from IMBlues/development
Browse files Browse the repository at this point in the history
fix: 修复 no_page 时返回异常
  • Loading branch information
IMBlues authored Mar 23, 2022
2 parents b50e08e + 21d7e0f commit afafd2c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/api/bkuser_core/profiles/v2/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def list(self, request, *args, **kwargs):
if fields:
self._check_fields(fields)
else:
fields = [x for x in self.get_serializer().fields if x in self._get_model_field_names()]
fields = self.get_serializer().fields

self._ensure_enabled_field(request, fields=fields)

Expand Down Expand Up @@ -204,6 +204,7 @@ def list(self, request, *args, **kwargs):
serializer = self.get_serializer(page, fields=fields, many=True)
return self.get_paginated_response(serializer.data)

fields = [x for x in fields if x in self._get_model_field_names()]
# 全量数据太大,使用 serializer 效率非常低
# 由于存在多对多字段,所以返回列表会平铺展示,同一个 username 会多次展示
# https://docs.djangoproject.com/en/1.11/ref/models/querysets/#values
Expand Down

0 comments on commit afafd2c

Please sign in to comment.