Skip to content

Fix dept and menu table subqueries #914

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 3 commits into from
Nov 11, 2025
Merged

Fix dept and menu table subqueries #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f5839d
Fix dept and menu table subqueries
wu-clan Nov 11, 2025
a5d0d10
Fix user cache cleanup when updating data scope
wu-clan Nov 11, 2025
8da0d0d
Merge branch 'master' into fix-get-children
wu-clan Nov 11, 2025
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
2 changes: 1 addition & 1 deletion backend/app/admin/crud/crud_dept.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ async def get_children(self, db: AsyncSession, dept_id: int) -> Sequence[Dept |
:param dept_id: 部门 ID
:return:
"""
return await self.select_models(db, parent_id=dept_id, del_flag=0)
return await self.select_models(db, parent_id=dept_id, del_flag=False)


dept_dao: CRUDDept = CRUDDept(Dept)
5 changes: 2 additions & 3 deletions backend/app/admin/crud/crud_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,15 @@ async def delete(self, db: AsyncSession, menu_id: int) -> int:
"""
return await self.delete_model(db, menu_id)

async def get_children(self, db: AsyncSession, menu_id: int) -> list[Menu | None]:
async def get_children(self, db: AsyncSession, menu_id: int) -> Sequence[Menu | None]:
"""
获取子菜单列表

:param db: 数据库会话
:param menu_id: 菜单 ID
:return:
"""
menu = await self.select_model(db, menu_id, load_strategies=['children'])
return menu.children
return await self.select_models(db, parent_id=menu_id)


menu_dao: CRUDMenu = CRUDMenu(Menu)