diff --git a/.typos.toml b/.typos.toml index bb9c4600..90887b65 100644 --- a/.typos.toml +++ b/.typos.toml @@ -1,4 +1,5 @@ [default.extend-words] +sibing = "sibing" [default.extend-identifiers] maintain_column_froms = "maintain_column_froms" [files] diff --git a/backend/apps/system/api/user.py b/backend/apps/system/api/user.py index 69386e1e..d6f33cda 100644 --- a/backend/apps/system/api/user.py +++ b/backend/apps/system/api/user.py @@ -33,7 +33,7 @@ async def pager( paginator = Paginator(session) filters = {} - 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() if oidlist: origin_stmt = origin_stmt.where(UserWsModel.oid.in_(oidlist)) if status is not None: @@ -75,7 +75,7 @@ async def pager( # 组合结果 result = [ - {**extra_attrs[user_id], "oid_list": oid_list} + {**extra_attrs[user_id], "oid_list": list(filter(None, oid_list))} for user_id, oid_list in merged.items() ] user_page.items = result diff --git a/frontend/src/views/dashboard/common/AddViewDashboard.vue b/frontend/src/views/dashboard/common/AddViewDashboard.vue index 4ef2b519..ad70fb96 100644 --- a/frontend/src/views/dashboard/common/AddViewDashboard.vue +++ b/frontend/src/views/dashboard/common/AddViewDashboard.vue @@ -1,5 +1,5 @@