diff --git a/config/routes.ts b/config/routes.ts index 3bdebbf5d05f5b68162f197540aa37b6191facab..1216828c49906804fe7f6ff813ea72d6db87c1aa 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -92,7 +92,7 @@ { path: "user", name: "user", - access: "canAdmin", + access: "canTestAdmin", hideInMenu: true, component: "./Sys/Users" }, @@ -109,7 +109,7 @@ component: "./Sys/Suite" }, { - redirect: 'user' + redirect: 'tag' } ] }, diff --git a/src/access.ts b/src/access.ts index d2dc319e3f747481afe6f8cba002be0f60860f8b..3645fb990f6d3550cd1beb52e097b91982389f8b 100644 --- a/src/access.ts +++ b/src/access.ts @@ -14,7 +14,7 @@ export default function access(initialState: { currentUser?: API.CurrentUser | u const canTestAdmin = () => ["admin", "senior"].includes(currentUser?.role || "") const canTester = () => ["admin", "senior", "junior"].includes(currentUser?.role || "") const canMember = () => ["admin", "senior", "junior", "common"].includes(currentUser?.role || ""); - + return { currentUser: () => currentUser, @@ -27,7 +27,7 @@ export default function access(initialState: { currentUser?: API.CurrentUser | u canTestAdmin, canTester, canCurrentTester: (nick_name: any) => { - if (isAdmin() && isTestAdmin()) return true + if (isAdmin() || isTestAdmin()) return true return isTester() && nick_name === currentUser?.nick_name },