diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 72cdf68..050b9a6 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -760,7 +760,9 @@ export class KeyUnitManagementComponent implements OnInit {
     });
     dialogRef.afterClosed().subscribe((result) => {
       //console.log(result);
-      element.name = result;
+      if (element) {
+        element.name = result;
+      }
     });
   }
 
@@ -1033,12 +1035,13 @@ export class upname {
         .subscribe(
           (data: any) => {
             this.snackBar.open("修改名字成功", "确定", config);
+            this.dialogRef.close(this.unitname);
           },
           (err) => {
             this.snackBar.open(err, "确定", config);
+            this.dialogRef.close();
           }
         );
-      this.dialogRef.close(this.unitname);
     }
   }
 }