Skip to content

Commit 628dbed

Browse files
committed
feat: admin return all web menus
1 parent c29e2d5 commit 628dbed

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

  • src/backend/bisheng/user/domain/services

src/backend/bisheng/user/domain/services/auth.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from bisheng.common.services.config_service import settings
1616
from bisheng.database.constants import AdminRole
1717
from bisheng.database.models.group import GroupDao
18-
from bisheng.database.models.role_access import AccessType, RoleAccessDao
18+
from bisheng.database.models.role_access import AccessType, RoleAccessDao, WebMenuResource
1919
from bisheng.database.models.user_group import UserGroupDao
2020
from ..models.user import User
2121
from ..models.user_role import UserRoleDao
@@ -329,8 +329,9 @@ async def get_roles_web_menu(cls, user: User) -> (List[int] | str, List[str]):
329329
role = 'group_admin'
330330
else:
331331
role = role_ids
332-
# Get a list of a user's menu bar permissions
333-
web_menu = await RoleAccessDao.aget_role_access(role_ids, AccessType.WEB_MENU)
334-
web_menu = list(set([one.third_id for one in web_menu]))
335-
332+
# Get a list of a user's menu bar permissions
333+
web_menu = await RoleAccessDao.aget_role_access(role_ids, AccessType.WEB_MENU)
334+
web_menu = list(set([one.third_id for one in web_menu]))
335+
else:
336+
web_menu = [one.value for one in WebMenuResource]
336337
return role, web_menu

0 commit comments

Comments
 (0)