Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-02-10 17:49:30 +08:00
parent db3013c809
commit 5e57929e3d
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/core/guards/auth.guard.ts
View File

@ -59,25 +59,25 @@ export class AuthGuard extends ACLGuard {
private handle(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, type: 1 | 2, router?: string): Observable<boolean> {
if (!router) {
if (type === 1) {
return super.canActivate(route, state);
} else {
return super.canActivateChild(route, state);
}
return type === 1 ? super.canActivate(route, state) : super.canActivateChild(route, state);
}
// console.log(route, state, type, router);
return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router }).pipe(
return this.baseService.request('/api/mdc/cuc/enterpriseProject/getUserDefaultEnterpriseProject').pipe(
switchMap(res => {
if (res) {
if (res.enterpriseIdentity) {
// 超级管理员赋值全量权限
this.srv1.setFull(true);
return of(true);
} else {
// 如果不是超级管理员 获取权限
return this.baseService.request('/api/mdc/cuc/functionButton/getUserFunctionButton', { link: router });
}
}),
switchMap(res => {
if (res?.abilities) {
this.srv1.setAbility(res.abilities || []);
this.menuService.resume();
}
if (type === 1) {
return super.canActivate(route, state);
} else {
return super.canActivateChild(route, state);
}
return type === 1 ? super.canActivate(route, state) : super.canActivateChild(route, state);
})
);
}
@ -86,7 +86,7 @@ export class AuthGuard extends ACLGuard {
* 根据参数拼接原始路由
* @param params 参数
* @param route 实际路由
* @returns
* @returns
*/
private settingRoute(params: any, route: string) {
let _route = route;