diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs b/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs index d9796531..d836a20f 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/Users/UserAppService.cs @@ -79,6 +79,7 @@ namespace Lion.AbpPro.Users [Authorize(IdentityPermissions.Users.Update)] public virtual async Task UpdateAsync(UpdateUserInput input) { + input.UserInfo.IsActive = true; return await _identityUserAppService.UpdateAsync(input.UserId, input.UserInfo); } diff --git a/vben271/src/store/modules/permission.ts b/vben271/src/store/modules/permission.ts index 3a6b3f6f..d848720b 100644 --- a/vben271/src/store/modules/permission.ts +++ b/vben271/src/store/modules/permission.ts @@ -165,6 +165,7 @@ export const usePermissionStore = defineStore({ case PermissionModeEnum.ROUTE_MAPPING: const permissions = this.getPermCodeList; + const roleRouteFilter = (route: AppRouteRecordRaw) => { const { meta } = route; const { policy } = meta || {}; @@ -173,6 +174,8 @@ export const usePermissionStore = defineStore({ ? true : permissions.includes(policy as string); }; + console.log(roleRouteFilter); + console.log(asyncRoutes); routes = filter(asyncRoutes, roleRouteFilter); routes = routes.filter(roleRouteFilter); routes = routes.filter((e) => e.path.startsWith('/dashboard') || e.children?.length != 0); diff --git a/vben271/src/store/modules/user.ts b/vben271/src/store/modules/user.ts index e18e9e6d..0876efc6 100644 --- a/vben271/src/store/modules/user.ts +++ b/vben271/src/store/modules/user.ts @@ -157,6 +157,10 @@ export const useUserStore = defineStore({ const application = await getAbpApplicationConfiguration(); const permissionStore = usePermissionStore(); const grantPolicy = Object.keys(application.auth?.grantedPolicies as object); + if (grantPolicy.length == 0) { + router.replace(PageEnum.BASE_LOGIN); + return; + } permissionStore.setPermCodeList(grantPolicy); },