From f7995739c36dfa0f4c010e7e8a5214ec93f0f7bf Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 28 Apr 2022 17:26:09 +0800
Subject: [PATCH] 1.2.0

---
 .../announcement-message.component.html                  | 9 ++++++---
 .../announcement-message.component.ts                    | 2 ++
 src/app/routes/sys-setting/sys-setting-routing.module.ts | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
index e70f7e38..ff5a6eb5 100644
--- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
+++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
@@ -25,8 +25,10 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button [disabled]="false" nzType="primary">导出</button>
+        <button nz-button nzType="primary" acl [acl-ability]="['SYSTEM-ANNOUNCEMENT-list']"
+          [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button [disabled]="false" nzType="primary" acl
+          [acl-ability]="['SYSTEM-ANNOUNCEMENT-export']">导出</button>
         <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -40,7 +42,8 @@
 <nz-card class="content-box">
   <div class="d-flex justify-content-end mb-sm mt-sm">
     <div>
-      <button nz-button nzType="primary" (click)="roleAction('', 1)">新增公告</button>
+      <button nz-button nzType="primary" (click)="roleAction('', 1)" acl
+        [acl-ability]="['SYSTEM-ANNOUNCEMENT-add']">新增公告</button>
     </div>
   </div>
   <st #st [data]="service.$api_getAnnouncementInfoList_page" [columns]="columns" [req]="{  params: reqParams }"
diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
index 74ea33fd..adabb773 100644
--- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
+++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
@@ -39,10 +39,12 @@ export class AnnouncementMessageComponent implements OnInit {
       buttons: [
         {
           text: '编辑',
+          acl: { ability: ['SYSTEM-ANNOUNCEMENT-edit'] },
           click: item => this.roleAction(item, 2)
         },
         {
           text: '删除',
+          acl: { ability: ['SYSTEM-ANNOUNCEMENT-delete'] },
           click: item => this.deleteAction(item)
         },
       ]
diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts
index 17f14f29..fb77019d 100644
--- a/src/app/routes/sys-setting/sys-setting-routing.module.ts
+++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts
@@ -54,7 +54,7 @@ const routes: Routes = [
   { path: 'network-freight/new/:id', component: NetworkFreightNewComponent },
   { path: 'close-account', component: CloseAccountComponent },
   // { path: 'btn-management', component: BtnManagementComponent },
-  { path: 'announcement-message', component: AnnouncementMessageComponent },
+  { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } },
   { path: 'insurance-set', component: InsuranceSetComponent },
   { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } }
 ];