From 5835ed8790b22b3ff8f851e5df713ab346eda03b Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Fri, 1 Jul 2022 15:46:17 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/addrole/addrole.component.html       |  2 +-
 .../role/editrole/editrole.component.ts       |  3 +-
 .../system-management/role/role.component.ts  | 51 ++++++++-----------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/app/system-management/role/addrole/addrole.component.html b/src/app/system-management/role/addrole/addrole.component.html
index 3351bb6..f203b07 100644
--- a/src/app/system-management/role/addrole/addrole.component.html
+++ b/src/app/system-management/role/addrole/addrole.component.html
@@ -12,7 +12,7 @@
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="权限">权限</nz-form-label>
       <nz-form-control>
         <nz-select formControlName="power" nzPlaceHolder="请选择权限" nzMode="multiple">
-          <nz-option *ngFor="let o of optionList" [nzValue]="o" [nzLabel]="o.displayName"></nz-option>
+          <nz-option *ngFor="let o of optionList" [nzValue]="o.name" [nzLabel]="o.displayName"></nz-option>
         </nz-select>
         <ng-template #renderTemplate>
           <nz-spin *ngIf="isLoading"></nz-spin>
diff --git a/src/app/system-management/role/editrole/editrole.component.ts b/src/app/system-management/role/editrole/editrole.component.ts
index b77cfff..bb72dc1 100644
--- a/src/app/system-management/role/editrole/editrole.component.ts
+++ b/src/app/system-management/role/editrole/editrole.component.ts
@@ -18,6 +18,8 @@ export class EditroleComponent implements OnInit {
 
   multipleValue: any
   ngOnInit(): void {
+    console.log(this.data)
+    console.log(6666,this.optionList)
     this.nodes.length != 0 ? null : this.getAllMenus()
     this.multipleValue = this.data.grantedPermissions
     this.getMenus()
@@ -37,7 +39,6 @@ export class EditroleComponent implements OnInit {
     this.http.get('/api/services/app/Role/Get', {
       params: params
     }).subscribe((data: any) => {
-      // console.log(666, data)
       let arr = []
       data.result.menus.forEach(element => {
         arr.push(element.id)
diff --git a/src/app/system-management/role/role.component.ts b/src/app/system-management/role/role.component.ts
index a721692..e912bfc 100644
--- a/src/app/system-management/role/role.component.ts
+++ b/src/app/system-management/role/role.component.ts
@@ -75,20 +75,15 @@ export class RoleComponent implements OnInit {
       nzMaskClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          
           await new Promise(resolve => {
             console.log('表单信息', instance.validateForm)
-            let arr = []
-            instance.validateForm.value.power.forEach(element => {
-              arr.push(element.name)
-            });
             let body = {
               name: instance.validateForm.value.name,
               DisplayName: instance.validateForm.value.name,
-              grantedPermissions: arr
+              grantedPermissions: instance.validateForm.value.power || []
             }
-            let body2=instance.validateForm.value.menus
-            this.http.post('/api/services/app/Role/Create', body).subscribe((data:any) => {
+            let body2 = instance.validateForm.value.menus || []
+            this.http.post('/api/services/app/Role/Create', body).subscribe((data: any) => {
               resolve(data)
               this.http.post('/api/services/app/Role/SetRoleMenus', body2, {
                 params: {
@@ -96,14 +91,14 @@ export class RoleComponent implements OnInit {
                 }
               }).subscribe(data => {
                 resolve(data)
-                
-                // this.message.create('success', '分配成功！');
-
+                this.message.create('success', '创建成功！');
+                this.getAllRoles()
                 return true
+              }, err => {
+                this.message.create('warning', '分配菜单错误！');
               })
-              this.message.create('success', '创建成功！');
-              this.getAllRoles()
-              return true
+            }, err => {
+              this.message.create('warning', '创建角色错误！');
             })
           })
         } else {
@@ -116,14 +111,13 @@ export class RoleComponent implements OnInit {
     modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
     modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
   }
-  
+
   edit(item) {
     const modal = this.modal.create({
       nzTitle: '编辑角色',
       nzContent: EditroleComponent,
       nzViewContainerRef: this.viewContainerRef,
       nzWidth: 400,
-      // nzOkLoading: true,
       nzComponentParams: {
         data: item,
         optionList: this.optionList,
@@ -134,33 +128,30 @@ export class RoleComponent implements OnInit {
         if (instance.validateForm.valid) {
           await new Promise(resolve => {
             console.log('表单信息', instance.validateForm)
-            let arr = []
-            instance.validateForm.value.power.forEach(element => {
-              arr.push(element.name ? element.name : element)
-            });
             let body = {
               id: item.id,
               name: instance.validateForm.value.name,
               DisplayName: instance.validateForm.value.name,
-              grantedPermissions: arr
+              grantedPermissions: instance.validateForm.value.power || []
             }
-            let body2=instance.validateForm.value.menus
-            this.http.put('/api/services/app/Role/Update', body).subscribe((data:any) => {
+            let body2 = instance.validateForm.value.menus || []
+            this.http.put('/api/services/app/Role/Update', body).subscribe((data: any) => {
               resolve(data)
               this.http.post('/api/services/app/Role/SetRoleMenus', body2, {
                 params: {
                   roleId: data.result.id
                 }
               }).subscribe(data => {
-                resolve(data)
-
-                // this.message.create('success', '分配成功！');
-
+                this.message.create('success', '修改成功！');
+                this.getAllRoles()
                 return true
+                resolve(data)
+              }, err => {
+                this.message.create('warning', '分配菜单错误！');
               })
-              this.message.create('success', '修改成功！');
-              this.getAllRoles()
-              return true
+
+            }, err => {
+              this.message.create('warning', '修改角色错误！');
             })
           })
         } else {