fix: 俱乐部角色ORM过滤+商家订单权限002ab/003aa+legacy兜底+perm-debug

This commit is contained in:
XingQue
2026-07-06 19:25:15 +08:00
parent 7bb891187b
commit 2edca09859
6 changed files with 126 additions and 40 deletions

View File

@@ -12,7 +12,7 @@ from jituan.services.admin_context import (
is_system_super_admin,
)
from jituan.services.club_context import resolve_club_id_from_request, resolve_club_scope
from jituan.services.club_rbac import user_bound_role_names
from jituan.services.club_rbac import user_bound_role_names, describe_roles_in_scope
from jituan.services.kefu_menu_definitions import KEFU_MENU_ROW_DEFS
logger = logging.getLogger(__name__)
@@ -145,6 +145,7 @@ def build_menu_access_payload(request, username=None):
allowed = list(get_allowed_club_ids(request.user))
perm_codes = _permission_codes_list(permissions)
role_names = user_bound_role_names(request.user, club_id, scope, allowed)
roles_detail = describe_roles_in_scope(request.user, club_id, scope, allowed)
perm_hint = ''
if scope == DATA_SCOPE_SINGLE and not perm_codes:
@@ -174,6 +175,7 @@ def build_menu_access_payload(request, username=None):
'club_scope': scope,
'effective_club_id': club_id,
'perm_hint': perm_hint,
'roles_in_scope': roles_detail,
'can_switch_club': bool(club_ctx.get('can_switch_club')),
'is_group_admin': bool(club_ctx.get('is_group_admin')),
'menu_ready': True,