fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 21:49:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-15 15:45:00 +00:00
commit 0a6fbbf5ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
View File

@ -48,9 +48,9 @@ export async function setCurrentRole(ctx: Context, next) {
const userRoles = Array.from(rolesMap.values()); const userRoles = Array.from(rolesMap.values());
ctx.state.currentUser.roles = userRoles; ctx.state.currentUser.roles = userRoles;
const systemSettings = (await cache.wrap(`app:systemSettings`, () => const systemSettings = (await cache.wrap(`app:systemSettings`, () =>
ctx.db.getRepository('systemSettings').findOne(), ctx.db.getRepository('systemSettings').findOne({ raw: true }),
)) as Model; )) as Model;
const roleMode = systemSettings?.get('roleMode') || SystemRoleMode.default; const roleMode = systemSettings?.roleMode || SystemRoleMode.default;
if ([currentRole, ctx.state.currentRole].includes(UNION_ROLE_KEY) && roleMode === SystemRoleMode.default) { if ([currentRole, ctx.state.currentRole].includes(UNION_ROLE_KEY) && roleMode === SystemRoleMode.default) {
currentRole = userRoles[0].name; currentRole = userRoles[0].name;
ctx.state.currentRole = userRoles[0].name; ctx.state.currentRole = userRoles[0].name;