From 77ba2d540072fd49cf225ada46808134947d3a73 Mon Sep 17 00:00:00 2001
From: kely <kkerwin@yeah.net>
Date: Sun, 19 May 2024 10:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-admin-app/src/app/app.config.ts           |  12 +
 web-admin-app/src/app/app.routes.ts           |  89 ++++++-
 .../fixed-asset/fixed-asset.component.html    | 234 ++++++++++++++++--
 .../fixed-asset-ledger.component.html         |   2 +-
 .../fixed-asset-ledger.component.ts           |   7 +
 .../flow-layout/flow-layout.component.html    |  40 ++-
 .../pages/system/index/system.component.html  |  21 +-
 .../app/shared/permission/permission.guard.ts |   8 +-
 web-admin-app/src/favicon.ico                 | Bin 15086 -> 4158 bytes
 9 files changed, 376 insertions(+), 37 deletions(-)

diff --git a/web-admin-app/src/app/app.config.ts b/web-admin-app/src/app/app.config.ts
index 49bacde..06ff2da 100644
--- a/web-admin-app/src/app/app.config.ts
+++ b/web-admin-app/src/app/app.config.ts
@@ -15,6 +15,18 @@ import { ServerPaginatedTableService } from './shared/components/server-paginate
 
 registerLocaleData(zh)
 
+const disabledLog = () => {
+	const originalLog = console.log
+	const isEnabled = localStorage.getItem('_log')
+	if (isEnabled) {
+		console.log = originalLog
+	} else {
+		console.log = () => {}
+	}
+}
+
+disabledLog()
+
 export function initializeApp(configService: ServerPaginatedTableService) {
 	return () => {
 		configService.initial()
diff --git a/web-admin-app/src/app/app.routes.ts b/web-admin-app/src/app/app.routes.ts
index 492094d..6edef79 100644
--- a/web-admin-app/src/app/app.routes.ts
+++ b/web-admin-app/src/app/app.routes.ts
@@ -66,15 +66,16 @@ export const routes: Routes = [
 		path: 'login',
 		component: LoginComponent,
 	},
-	{
-		path: 'forbidden',
-		component: ForbiddenComponent,
-	},
+
 	{
 		path: '',
 		component: LayoutComponent,
 		canActivate: [authGuard],
 		children: [
+			{
+				path: 'forbidden',
+				component: ForbiddenComponent,
+			},
 			{
 				path: '',
 				pathMatch: 'full',
@@ -115,7 +116,17 @@ export const routes: Routes = [
 				path: 'system',
 				component: SystemComponent,
 				title: '系统管理',
+				canActivate: [permissionGuard],
+				data: {
+					permission: {
+						only: ['system-user:view', 'system-role:view', 'system-flow-form:view'],
+					},
+				},
 				children: [
+					{
+						path: '403',
+						component: ForbiddenComponent,
+					},
 					{
 						path: '',
 						pathMatch: 'full',
@@ -126,19 +137,33 @@ export const routes: Routes = [
 						component: OrgSettingComponent,
 						canActivate: [permissionGuard],
 						title: '组织架构',
-						data: {},
+						data: {
+							permission: {
+								only: ['system-user:view'],
+								redirectTo: '/system/403',
+							},
+						},
 					},
 					{
 						path: 'role',
 						component: SystemRoleComponent,
 						canActivate: [permissionGuard],
 						title: '角色管理',
-						data: {},
+						data: {
+							permission: {
+								only: ['system-role:view'],
+							},
+						},
 					},
 					{
 						path: 'flow',
 						canActivate: [permissionGuard],
 						title: '流程管理',
+						data: {
+							permission: {
+								only: ['system-flow-form:view'],
+							},
+						},
 						children: [
 							{
 								path: '',
@@ -181,6 +206,10 @@ export const routes: Routes = [
 				title: '固资管理',
 				component: FixedAssetComponent,
 				children: [
+					{
+						path: '403',
+						component: ForbiddenComponent,
+					},
 					{
 						path: '',
 						pathMatch: 'full',
@@ -190,7 +219,26 @@ export const routes: Routes = [
 						path: 'ledger',
 						title: '资产台账',
 						component: FixedAssetLedgerComponent,
+						canActivate: [permissionGuard],
+						data: {
+							permission: {
+								only: [
+									'ledger-asset-search:view',
+									'ledger-storage:view',
+									'ledger-asset-belong:view',
+									'ledger-asset-org:view',
+									'ledger-asset-position:view',
+									'ledger-asset-category:view',
+									'ledger-asset-my-own:view',
+								],
+								redirectTo: '/fixed-asset/403',
+							},
+						},
 						children: [
+							{
+								path: '403',
+								component: ForbiddenComponent,
+							},
 							{
 								path: '',
 								pathMatch: 'full',
@@ -200,6 +248,14 @@ export const routes: Routes = [
 								path: 'asset-search',
 								title: '资产公共台账',
 								component: FixedAssetSearchComponent,
+								canActivate: [permissionGuard],
+
+								data: {
+									permission: {
+										only: ['ledger-asset-search:view'],
+										redirectTo: '/fixed-asset/ledger/403',
+									},
+								},
 							},
 							{
 								path: 'storage',
@@ -460,7 +516,21 @@ export const routes: Routes = [
 				path: 'asset-flow',
 				title: '固资流程',
 				component: FlowLayoutComponent,
+				data: {
+					permission: {
+						only: [
+							'asset-flow-home:view',
+							'asset-flow-my-apply:view',
+							'asset-flow-my-todo:view',
+							'asset-flow-my-finished:view',
+						],
+					},
+				},
 				children: [
+					{
+						path: '403',
+						component: ForbiddenComponent,
+					},
 					{
 						path: '',
 						pathMatch: 'full',
@@ -470,6 +540,13 @@ export const routes: Routes = [
 						path: 'index',
 						title: '流程首页',
 						component: FlowMainComponent,
+						canActivate: [permissionGuard],
+						data: {
+							permission: {
+								only: ['asset-flow-home:view'],
+								redirectTo: '/asset-flow/403',
+							},
+						},
 					},
 					{
 						path: 'my-apply',
diff --git a/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html b/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html
index 58c1e39..f803eff 100644
--- a/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html
+++ b/web-admin-app/src/app/pages/fixed-asset/fixed-asset.component.html
@@ -2,39 +2,120 @@
 	class="menu bg-white shadow fixed left-0 top-12 bottom-0 z-20 w-48 flex-shrink-0 py-3 overflow-y-auto overflow-x-hidden"
 >
 	<ul nz-menu nzMode="inline">
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/fixed-asset/ledger']" nzMatchRouter>固资台账</li>
+		<li
+			nz-menu-item
+			*appPermission="[
+				'ledger-asset-search:view',
+				'ledger-storage:view',
+				'ledger-asset-belong:view',
+				'ledger-asset-org:view',
+				'ledger-asset-position:view',
+				'ledger-asset-category:view',
+				'ledger-asset-my-own:view'
+			]"
+			[nzPaddingLeft]="12"
+			[routerLink]="['/fixed-asset/ledger']"
+			nzMatchRouter
+		>
+			固资台账
+		</li>
 		<li
 			nz-submenu
 			[nzOpen]="openedSubmenu.startsWith('/fixed-asset/manage/')"
 			[nzPaddingLeft]="12"
 			nzTitle="固资管理"
+			*appPermission="[
+				'fixed-asset-manage:view',
+				'fixed-asset-manage-entry:view',
+				'fixed-asset-manage-distribution:view',
+				'fixed-asset-manage-return:view',
+				'fixed-asset-manage-borrow:view',
+				'fixed-asset-manage-revert:view',
+				'fixed-asset-manage-allot:view',
+				'fixed-asset-manage-transfer:view',
+				'fixed-asset-manage-scrap:view'
+			]"
 		>
 			<ul>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/list']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/list']"
+					nzMatchRouter
+				>
 					资产管理
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/entry']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-entry:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/entry']"
+					nzMatchRouter
+				>
 					资产入库
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/distribution']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-distribution:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/distribution']"
+					nzMatchRouter
+				>
 					资产领用
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/return']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-return:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/return']"
+					nzMatchRouter
+				>
 					资产退库
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/borrow']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-borrow:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/borrow']"
+					nzMatchRouter
+				>
 					资产借用
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/revert']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-revert:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/revert']"
+					nzMatchRouter
+				>
 					资产归还
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/allot']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-allot:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/allot']"
+					nzMatchRouter
+				>
 					资产调拨
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/transfer']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-transfer:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/transfer']"
+					nzMatchRouter
+				>
 					资产转移
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/manage/scrap']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-manage-scrap:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/manage/scrap']"
+					nzMatchRouter
+				>
 					资产报废
 				</li>
 
@@ -73,16 +154,39 @@
 			[nzPaddingLeft]="12"
 			nz-submenu
 			nzTitle="维护维保"
+			*appPermission="[
+				'fixed-asset-repair-type:view',
+				'fixed-asset-repair-list:view',
+				'fixed-asset-repair-fault:view'
+			]"
 			[nzOpen]="openedSubmenu.startsWith('/fixed-asset/repair/')"
 		>
 			<ul>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/repair/type']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-repair-type:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/repair/type']"
+					nzMatchRouter
+				>
 					维修类型
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/repair/list']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-repair-list:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/repair/list']"
+					nzMatchRouter
+				>
 					维修登记
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/repair/fault']" nzMatchRouter>
+				<li
+					*appPermission="['fixed-asset-repair-fault:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/repair/fault']"
+					nzMatchRouter
+				>
 					故障登记
 				</li>
 			</ul>
@@ -95,12 +199,25 @@
 			nz-submenu
 			nzTitle="盘点管理"
 			[nzOpen]="openedSubmenu.startsWith('/fixed-asset/stocktaking/')"
+			*appPermission="['stocktaking-plan:view', 'stocktaking-job:view']"
 		>
 			<ul>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/stocktaking/plan']" nzMatchRouter>
+				<li
+					*appPermission="['stocktaking-plan:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/stocktaking/plan']"
+					nzMatchRouter
+				>
 					盘点计划
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/stocktaking/job']" nzMatchRouter>
+				<li
+					*appPermission="['stocktaking-job:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/stocktaking/job']"
+					nzMatchRouter
+				>
 					盘点任务
 				</li>
 			</ul>
@@ -112,15 +229,39 @@
 			nz-submenu
 			nzTitle="预警中心"
 			[nzOpen]="openedSubmenu.startsWith('/fixed-asset/alert/')"
+			*appPermission="[
+				'alert-borrow:view',
+				'alert-maintenance:view',
+				'alert-inventory-safety:view',
+				'alert-inventory-up:view',
+				'alert-inventory-down:view'
+			]"
 		>
 			<ul>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/alert/borrow']" nzMatchRouter>
+				<li
+					*appPermission="['alert-borrow:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/alert/borrow']"
+					nzMatchRouter
+				>
 					借用预警
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/alert/maintenance']" nzMatchRouter>
+				<li
+					*appPermission="['alert-maintenance:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/alert/maintenance']"
+					nzMatchRouter
+				>
 					维保到期预警
 				</li>
 				<li
+					*appPermission="[
+						'alert-inventory-safety:view',
+						'alert-inventory-up:view',
+						'alert-inventory-down:view'
+					]"
 					nzMatchRouter
 					[nzPaddingLeft]="24"
 					nz-submenu
@@ -129,6 +270,7 @@
 				>
 					<ul>
 						<li
+							*appPermission="['alert-inventory-safety:view']"
 							nz-menu-item
 							[nzPaddingLeft]="36"
 							[routerLink]="['/fixed-asset/alert/inventory/safety']"
@@ -137,6 +279,7 @@
 							安全库存
 						</li>
 						<li
+							*appPermission="['alert-inventory-up:view']"
 							nz-menu-item
 							[nzPaddingLeft]="36"
 							[routerLink]="['/fixed-asset/alert/inventory/up']"
@@ -145,6 +288,7 @@
 							安全库存上限
 						</li>
 						<li
+							*appPermission="['alert-inventory-down:view']"
 							nz-menu-item
 							[nzPaddingLeft]="36"
 							[routerLink]="['/fixed-asset/alert/inventory/down']"
@@ -163,27 +307,71 @@
 			nz-submenu
 			nzTitle="基础数据"
 			[nzOpen]="openedSubmenu.startsWith('/fixed-asset/basic/')"
+			*appPermission="[
+				'basic-category:view',
+				'basic-manufacturer:view',
+				'basic-supplier:view',
+				'basic-maintainer:view',
+				'basic-save-position:view',
+				'basic-warehouse:view'
+			]"
 		>
 			<ul>
 				<!-- <li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/goods-stock']" nzMatchRouter>
 					物品档案
 				</li> -->
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/category']" nzMatchRouter>
+				<li
+					*appPermission="['basic-category:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/basic/category']"
+					nzMatchRouter
+				>
 					物品分类
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/manufacturer']" nzMatchRouter>
+				<li
+					*appPermission="['basic-manufacturer:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/basic/manufacturer']"
+					nzMatchRouter
+				>
 					生产商
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/supplier']" nzMatchRouter>
+				<li
+					*appPermission="['basic-supplier:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/basic/supplier']"
+					nzMatchRouter
+				>
 					供应商
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/maintainer']" nzMatchRouter>
+				<li
+					*appPermission="['basic-maintainer:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/basic/maintainer']"
+					nzMatchRouter
+				>
 					维保商
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/save-position']" nzMatchRouter>
+				<li
+					*appPermission="['basic-save-position:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/basic/save-position']"
+					nzMatchRouter
+				>
 					存放位置
 				</li>
-				<li nz-menu-item [nzPaddingLeft]="24" [routerLink]="['/fixed-asset/basic/warehouse']" nzMatchRouter>
+				<li
+					*appPermission="['basic-warehouse:view']"
+					nz-menu-item
+					[nzPaddingLeft]="24"
+					[routerLink]="['/fixed-asset/basic/warehouse']"
+					nzMatchRouter
+				>
 					存放仓库
 				</li>
 			</ul>
diff --git a/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.html b/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.html
index 2e19388..d7616c4 100644
--- a/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.html
+++ b/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.html
@@ -12,7 +12,7 @@
 		</nz-tabset> -->
 		<ul class="flex bg-white tabs">
 			@for (t of tabs; track $index) {
-				<li [ngClass]="{ active: tab === t.path }">
+				<li [ngClass]="{ active: tab === t.path }" *appPermission="t.permission">
 					<button nz-button nzType="text" [routerLink]="t.path">{{ t.title }}</button>
 				</li>
 			}
diff --git a/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.ts b/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.ts
index ca2dd24..4def2c8 100644
--- a/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.ts
+++ b/web-admin-app/src/app/pages/fixed-asset/ledger/fixed-asset-ledger/fixed-asset-ledger.component.ts
@@ -8,22 +8,27 @@ const tabs = [
 	{
 		path: 'asset-search',
 		title: '资产公共台账',
+		permission: ['ledger-asset-search:view'],
 	},
 	{
 		path: 'storage',
 		title: '资产库存台账',
+		permission: ['ledger-storage:view'],
 	},
 	{
 		path: 'asset-belong',
 		title: '归属组织台账',
+		permission: ['ledger-asset-belong:view'],
 	},
 	{
 		path: 'asset-org',
 		title: '使用组织台账',
+		permission: ['ledger-asset-org:view'],
 	},
 	{
 		path: 'asset-position',
 		title: '存放位置台账',
+		permission: ['ledger-asset-position:view'],
 	},
 	// {
 	// 	path: 'asset-employee',
@@ -32,10 +37,12 @@ const tabs = [
 	{
 		path: 'asset-category',
 		title: '分类查询台账',
+		permission: ['ledger-asset-category:view'],
 	},
 	{
 		path: 'asset-my-own',
 		title: '所管资产台账',
+		permission: ['ledger-asset-my-own:view'],
 	},
 ]
 
diff --git a/web-admin-app/src/app/pages/flow/flow-layout/flow-layout.component.html b/web-admin-app/src/app/pages/flow/flow-layout/flow-layout.component.html
index 5c2d329..3d78468 100644
--- a/web-admin-app/src/app/pages/flow/flow-layout/flow-layout.component.html
+++ b/web-admin-app/src/app/pages/flow/flow-layout/flow-layout.component.html
@@ -2,10 +2,42 @@
 	class="menu bg-white shadow fixed left-0 top-12 bottom-0 z-20 w-48 flex-shrink-0 py-3 overflow-y-auto overflow-x-hidden"
 >
 	<ul nz-menu nzMode="inline">
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/asset-flow/index']" nzMatchRouter>流程首页</li>
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/asset-flow/my-apply']" nzMatchRouter>我的申请</li>
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/asset-flow/my-todo']" nzMatchRouter>待我处理</li>
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/asset-flow/my-finished']" nzMatchRouter>我已处理</li>
+		<li
+			*appPermission="['asset-flow-home:view']"
+			nz-menu-item
+			[nzPaddingLeft]="12"
+			[routerLink]="['/asset-flow/index']"
+			nzMatchRouter
+		>
+			流程首页
+		</li>
+		<li
+			*appPermission="['asset-flow-my-apply:view']"
+			nz-menu-item
+			[nzPaddingLeft]="12"
+			[routerLink]="['/asset-flow/my-apply']"
+			nzMatchRouter
+		>
+			我的申请
+		</li>
+		<li
+			*appPermission="['asset-flow-my-todo:view']"
+			nz-menu-item
+			[nzPaddingLeft]="12"
+			[routerLink]="['/asset-flow/my-todo']"
+			nzMatchRouter
+		>
+			待我处理
+		</li>
+		<li
+			*appPermission="['asset-flow-my-finished:view']"
+			nz-menu-item
+			[nzPaddingLeft]="12"
+			[routerLink]="['/asset-flow/my-finished']"
+			nzMatchRouter
+		>
+			我已处理
+		</li>
 	</ul>
 </div>
 
diff --git a/web-admin-app/src/app/pages/system/index/system.component.html b/web-admin-app/src/app/pages/system/index/system.component.html
index cee6b23..90eb8f0 100644
--- a/web-admin-app/src/app/pages/system/index/system.component.html
+++ b/web-admin-app/src/app/pages/system/index/system.component.html
@@ -2,9 +2,26 @@
 	class="menu bg-white shadow fixed left-0 top-12 bottom-0 z-20 w-48 flex-shrink-0 py-3 overflow-y-auto overflow-x-hidden"
 >
 	<ul nz-menu nzMode="inline">
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/system/user']" nzMatchRouter>组织架构</li>
-		<li nz-menu-item [nzPaddingLeft]="12" [routerLink]="['/system/role']" nzMatchRouter>角色管理</li>
 		<li
+			*appPermission="['system-user:view']"
+			nz-menu-item
+			[nzPaddingLeft]="12"
+			[routerLink]="['/system/user']"
+			nzMatchRouter
+		>
+			组织架构
+		</li>
+		<li
+			*appPermission="['system-role:view']"
+			nz-menu-item
+			[nzPaddingLeft]="12"
+			[routerLink]="['/system/role']"
+			nzMatchRouter
+		>
+			角色管理
+		</li>
+		<li
+			*appPermission="['system-flow-form:view']"
 			nzMatchRouter
 			[nzPaddingLeft]="12"
 			nz-submenu
diff --git a/web-admin-app/src/app/shared/permission/permission.guard.ts b/web-admin-app/src/app/shared/permission/permission.guard.ts
index 5fb940b..7d87f5f 100644
--- a/web-admin-app/src/app/shared/permission/permission.guard.ts
+++ b/web-admin-app/src/app/shared/permission/permission.guard.ts
@@ -5,11 +5,17 @@ import { PermissionService } from './permission.service'
 export const permissionGuard: CanActivateFn = (route, state) => {
 	const userPermission = inject(PermissionService)
 	const router = inject(Router)
-	const routePermission = route.data?.['permission']
+	const routePermission = route.data?.['permission']?.only
+
 	if (Array.isArray(routePermission)) {
 		if (userPermission.hasPermission(routePermission)) {
 			return true
 		}
+		const redirectTo = route.data?.['permission']?.redirectTo
+		console.log('redirectTo', redirectTo)
+		if (redirectTo) {
+			return router.createUrlTree([redirectTo])
+		}
 		return router.createUrlTree(['/', 'forbidden'])
 	}
 	return true
diff --git a/web-admin-app/src/favicon.ico b/web-admin-app/src/favicon.ico
index 57614f9c967596fad0a3989bec2b1deff33034f6..04fec5cacefab64f707a7b196a790e085f2ddf5f 100644
GIT binary patch
literal 4158
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
bABXfOi?dtjc`?p8V%zc5x$gd5kN^39PUh9e

literal 15086
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
Nr__JTFzvMr^FKp4S3v*(