From da353a10fbb07091a83c1c9de23c02641820916f Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Thu, 21 Jul 2022 16:03:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=80=89=E6=8B=A9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account-editer/account-editer.component.ts       |  2 +-
 .../src/app/routes/accounts/accounts.component.ts    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts
index 1d8ed8069..4ea0144eb 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/account-editer/account-editer.component.ts
@@ -120,7 +120,7 @@ export class AccountEditerComponent implements OnInit {
     modal.afterClose.subscribe(result => {
       if (result.refresh) {
         this.form.model.appId = result.data.id;
-        this.form.model.appName = result.data.name;
+        this.form.model.appName = result.data.appName;
         this.cdr.detectChanges();
       }
     });
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts
index b036f729b..7a697f928 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/accounts/accounts.component.ts
@@ -42,6 +42,7 @@ export class AccountsComponent implements OnInit {
       username: String;
       displayName: String;
       employeeNumber: String;
+      appId: String;
       appName: String;
       startDate: String;
       endDate: String;
@@ -66,6 +67,7 @@ export class AccountsComponent implements OnInit {
         username: '',
         displayName: '',
         employeeNumber: '',
+        appId: '',
         appName: '',
         startDate: '',
         endDate: '',
@@ -119,7 +121,11 @@ export class AccountsComponent implements OnInit {
     this.fetch();
   }
 
-  onReset(): void { }
+  onReset(): void {
+    this.query.params.appId = '';
+    this.query.params.appName = '';
+    this.query.params.username = '';
+  }
 
   onSelect(e: MouseEvent): void {
     e.preventDefault();
@@ -134,8 +140,8 @@ export class AccountsComponent implements OnInit {
     // Return a result when closed
     modal.afterClose.subscribe(result => {
       if (result.refresh) {
-        this.query.params.appName = result.data.name;
-        //this.query.params.appId = result.data.id;
+        this.query.params.appName = result.data.appName;
+        this.query.params.appId = result.data.id;
         console.log(result);
         this.fetch();
       }