From 162a90d61d75428f7c2b874f581fa11115e07489 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 29 Jun 2022 14:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/system-management/user/user.component.html |  2 +-
 src/app/system-management/user/user.component.ts   | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/system-management/user/user.component.html b/src/app/system-management/user/user.component.html
index 196c26c..86a45e2 100644
--- a/src/app/system-management/user/user.component.html
+++ b/src/app/system-management/user/user.component.html
@@ -56,7 +56,7 @@
       </div>
     </div>
     <div class="tablebox">
-      <nz-table #basicTable [nzData]="usersLIst" [nzShowPagination]='false' [nzPageSize]='16'>
+      <nz-table #basicTable [nzLoading]="loading" [nzData]="usersLIst" [nzShowPagination]='false' [nzPageSize]='16'>
         <thead>
           <tr>
             <th></th>
diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts
index 3416dd2..dc1674b 100644
--- a/src/app/system-management/user/user.component.ts
+++ b/src/app/system-management/user/user.component.ts
@@ -36,14 +36,15 @@ export class UserComponent implements OnInit {
   //获取所有用户
   usersLIst: any = []
   usersNum: string
-  OrganizaiotnId
-
+  OrganizationUnitId
+  loading: boolean;
   getAllUsers() {
+    this.loading=true
     let params = {
       Keyword: this.validateForm.value.search ? this.validateForm.value.search : '',
       SkipCount: String(this.SkipCount),
       MaxResultCount: String(this.MaxResultCount),
-      OrganizaiotnId: this.OrganizaiotnId
+      OrganizationUnitId: this.OrganizationUnitId
     }
     this.http.get('/api/services/app/User/GetAll', {
       params: params
@@ -51,6 +52,7 @@ export class UserComponent implements OnInit {
       this.usersLIst = data.result.items
       this.usersNum = data.result.totalCount
       console.log('所有用户', this.usersLIst)
+      this.loading=false
     })
   }
   SkipCount: number = 0  //0 16 32 48
@@ -99,6 +101,7 @@ export class UserComponent implements OnInit {
         resolve(data)
         this.defaultExpandedKeys = [this.nodes[0].id]
         this.nzSelectedKeys = [this.nodes[0].id]
+        this.OrganizationUnitId=[this.nodes[0].id]
         this.getAllUsers()
       })
     })
@@ -114,7 +117,7 @@ export class UserComponent implements OnInit {
     this.getAllUsers()
   }
   nzClick(event: NzFormatEmitEvent) {
-    this.OrganizaiotnId = event.node.origin.id
+    this.OrganizationUnitId = event.node.origin.id
     this.getAllUsers()
   }
   //新增用户