Skip to content

Fix the user menu sidebar parsing #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2025
Merged

Fix the user menu sidebar parsing #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions backend/app/admin/service/menu_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async def get_sidebar(*, db: AsyncSession, request: Request) -> list[dict[str, A
:param request: FastAPI 请求对象
:return:
"""

menu_data = None
if request.user.is_superuser:
menu_data = await menu_dao.get_sidebar(db, None)
else:
Expand All @@ -64,8 +64,11 @@ async def get_sidebar(*, db: AsyncSession, request: Request) -> list[dict[str, A
for role in roles:
menu_ids.update(menu.id for menu in role.menus)
menu_data = await menu_dao.get_sidebar(db, list(menu_ids))
menu_tree = get_vben5_tree_data(menu_data)
return menu_tree

if menu_data:
return get_vben5_tree_data(menu_data)

return []

@staticmethod
async def create(*, db: AsyncSession, obj: CreateMenuParam) -> None:
Expand Down