Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion backend/app/admin/service/user_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ async def get_list(*, db: AsyncSession, dept: int, username: str, phone: str, st
user_select = await user_dao.get_select(dept=dept, username=username, phone=phone, status=status)
data = await paging_data(db, user_select)
if data['items']:
data['items'] = select_join_serialize(data['items'], relationships=['User-m2o-Dept', 'User-m2m-Role'])
serialized_items = select_join_serialize(data['items'], relationships=['User-m2o-Dept', 'User-m2m-Role'])
# 确保返回的是列表,即使只有一个元素
data['items'] = [serialized_items] if not isinstance(serialized_items, list) else serialized_items
return data

@staticmethod
Expand Down