From 7d25e6c9a1383ce7972ad2698f5995cab2ff2dd0 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 28 Apr 2022 19:55:12 +0800
Subject: [PATCH 1/2] edit

---
 .../menu-tree/menu-tree.component.ts                     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts
index 1db86b54..b71b2f52 100644
--- a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts
+++ b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts
@@ -122,8 +122,17 @@ export class MenuTreeComponent implements OnInit, OnChanges {
         });
       }
     } else {
+      console.log(event);
+
       if (event.node?.isChecked) {
         this.recursionSetNodeAuth(event.node.origin);
+        if (event.node.parentNode) {
+          this._NodeAuthMap.set(event.node.parentNode.origin.id, {
+            authorityId: event.node.parentNode.origin.id,
+            buttonAuthorityIds: [],
+            isUpdateAuthority: 1
+          });
+        }
         if (this.origin.checked) {
           this.origin.buttonInfoList.forEach((auth: any) => this._apiAuthSet.add(auth.functionButtonId));
         }

From 17da1ee45d3d205a28b82c5812d752b2bad3266d Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 28 Apr 2022 19:58:12 +0800
Subject: [PATCH 2/2] edit

---
 .../individual-income/individual-income.component.html    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
index 3087e371..bf8b851d 100644
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
@@ -45,10 +45,10 @@
       已选择
       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
     </div>
-    <button nz-button nzType="primary" (click)="upload()" acl  [acl-ability]="['TAX-ORDERREPORT-declare ']">申报</button>
-    <button nz-button nzType="primary" (click)="corrections()" acl  [acl-ability]="['TAX-ORDERREPORT-change ']">更正</button>
-    <button nz-button nzType="primary" (click)="resetData()" acl  [acl-ability]="['TAX-ORDERREPORT-threshold ']">修改起征点</button>
-    <button nz-button nzType="primary" (click)="uploadSetting()" acl  [acl-ability]="['TAX-ORDERREPORT-resetData ']">更新数据</button>
+    <button nz-button nzType="primary" (click)="upload()" acl  [acl-ability]="['TAX-INCOME-declare']">申报</button>
+    <button nz-button nzType="primary" (click)="corrections()" acl  [acl-ability]="['TAX-INCOME-change']">更正</button>
+    <button nz-button nzType="primary" (click)="resetData()" acl  [acl-ability]="['TAX-INCOME-threshold']">修改起征点</button>
+    <button nz-button nzType="primary" (click)="uploadSetting()" acl  [acl-ability]="['TAX-INCOME-resetData']">更新数据</button>
   </div>
 </ng-template>