We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 330fef1 commit 9a0249aCopy full SHA for 9a0249a
1 file changed
backend/apps/system/api/user.py
@@ -33,7 +33,7 @@ async def pager(
33
paginator = Paginator(session)
34
filters = {}
35
36
- origin_stmt = select(UserModel.id).join(UserWsModel, UserModel.id == UserWsModel.uid).where(UserModel.id != 1).distinct()
+ origin_stmt = select(UserModel.id).join(UserWsModel, UserModel.id == UserWsModel.uid, isouter=True).where(UserModel.id != 1).distinct()
37
if oidlist:
38
origin_stmt = origin_stmt.where(UserWsModel.oid.in_(oidlist))
39
if status is not None:
@@ -75,7 +75,7 @@ async def pager(
75
76
# 组合结果
77
result = [
78
- {**extra_attrs[user_id], "oid_list": oid_list}
+ {**extra_attrs[user_id], "oid_list": list(filter(None, oid_list))}
79
for user_id, oid_list in merged.items()
80
]
81
user_page.items = result
0 commit comments