From 12be5d37b537ddbb77dd90bc91c001a5de222f40 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 22 Feb 2022 16:45:33 +0800
Subject: [PATCH] ediut

---
 .../role-management/edit/edit.component.html  |  2 +-
 .../role-management/menu/menu.component.ts    | 20 ++++++++++---------
 .../role-management.component.ts              |  5 +++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.html b/src/app/routes/sys-setting/components/role-management/edit/edit.component.html
index 5c8790c6..8291cad4 100644
--- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.html
+++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.html
@@ -9,7 +9,7 @@
 <div class="box">
   <se-container se-container="1">
     <se label="角色权限" required [labelWidth]="120">
-      <app-cuc-menu #menu (changeData)="getData($event)" [type]="params.id === 0 ? 'add' : 'edit'" [roleId]="params.id"
+      <app-cuc-menu #menu (changeData)="getData($event)" [type]="params.id === 0 ? 'add' : 'edit'" [roleId]="params.id" [appId]="params.appId"
         [isAuthorityIdDTOList]="roleInfoData.authority || []"
         [authorityAssistId]="roleInfoData.authorityAssistId || []">
       </app-cuc-menu>
diff --git a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts
index 635ec659..68b63dcb 100644
--- a/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts
+++ b/src/app/routes/sys-setting/components/role-management/menu/menu.component.ts
@@ -41,15 +41,17 @@ export class SettingMenuComponent implements OnInit, OnChanges {
 
   ngOnInit() {}
   getAllFunction() {
-    this.service.request(this.service.$api_getAllFunctionInfoByAppId, { appId: this.appId }, 'POST', true, 'FORM').subscribe(res => {
-      // if (this.source === 'onlyRelationAuth') {
-      //   this.addDisabledTree(res);
-      // } else {
-      //   // this.addDisabledLeafTree(res);
-      // }
-      this.functionList = res;
-      this.defaultCheckedKeys = this.authorityAssistId;
-    });
+    this.service
+      .request(this.service.$api_getAllFunctionInfoByAppId, { appId: this.appId || this.envSrv.env.appId }, 'POST', true, 'FORM')
+      .subscribe(res => {
+        // if (this.source === 'onlyRelationAuth') {
+        //   this.addDisabledTree(res);
+        // } else {
+        //   // this.addDisabledLeafTree(res);
+        // }
+        this.functionList = res;
+        this.defaultCheckedKeys = this.authorityAssistId;
+      });
   }
   addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) {
     if (this.authority.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) {
diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.ts b/src/app/routes/sys-setting/components/role-management/role-management.component.ts
index 48bf7e05..df6ede5b 100644
--- a/src/app/routes/sys-setting/components/role-management/role-management.component.ts
+++ b/src/app/routes/sys-setting/components/role-management/role-management.component.ts
@@ -56,7 +56,7 @@ export class RoleManagementComponent implements OnInit {
   ];
 
   type = 'user';
-  params = {
+  params: any = {
     listUrl: this.service.$api_get_role_page,
     deleteUrl: this.service.$api_dalete_role,
     infoUrl: this.service.$api_getRoleInfo,
@@ -74,7 +74,8 @@ export class RoleManagementComponent implements OnInit {
             deleteUrl: this.service.$api_dalete_role,
             infoUrl: this.service.$api_getRoleInfo,
             addUrl: this.service.$api_save_role,
-            updateUrl: this.service.$api_update_role
+            updateUrl: this.service.$api_update_role,
+            appId: 'A48F72F0A304427F921794BAD86B3522'
           };
         }
       }