Skip to content

Commit 9a0249a

Browse files
perf: User grid api
1 parent 330fef1 commit 9a0249a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

backend/apps/system/api/user.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ async def pager(
3333
paginator = Paginator(session)
3434
filters = {}
3535

36-
origin_stmt = select(UserModel.id).join(UserWsModel, UserModel.id == UserWsModel.uid).where(UserModel.id != 1).distinct()
36+
origin_stmt = select(UserModel.id).join(UserWsModel, UserModel.id == UserWsModel.uid, isouter=True).where(UserModel.id != 1).distinct()
3737
if oidlist:
3838
origin_stmt = origin_stmt.where(UserWsModel.oid.in_(oidlist))
3939
if status is not None:
@@ -75,7 +75,7 @@ async def pager(
7575

7676
# 组合结果
7777
result = [
78-
{**extra_attrs[user_id], "oid_list": oid_list}
78+
{**extra_attrs[user_id], "oid_list": list(filter(None, oid_list))}
7979
for user_id, oid_list in merged.items()
8080
]
8181
user_page.items = result

0 commit comments

Comments
 (0)