src/app/system-management/user/user.component.ts

@@ -17,16 +17,13 @@ export class UserComponent implements OnInit {
   constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient, private toTree: TreeService) { }
 
   ngOnInit(): void {
-    console.log(JSON.parse(sessionStorage.getItem('userdata')).organization.id);
-
     this.validateForm = this.fb.group({
       search: [null]
     });
-    this.getAllOrganization()
+    this.getAllUsers()
-    // this.getAllUsers()
 
     this.getAllRoles()
-
+    this.getAllOrganization()
   }
   nzSelectedKeys: any[] = []
   defaultExpandedKeys = [];
@@ -43,10 +40,8 @@ export class UserComponent implements OnInit {
       Keyword: this.validateForm.value.search ? this.validateForm.value.search : '',
       SkipCount: String(this.SkipCount),
       MaxResultCount: String(this.MaxResultCount),
-      OrganizaiotnId: this.OrganizaiotnId
+      OrganizaiotnId:this.OrganizaiotnId
     }
-
-
     this.http.get('/api/services/app/User/GetAll', {
       params: params
     }).subscribe((data: any) => {
@@ -96,11 +91,6 @@ export class UserComponent implements OnInit {
         });
         this.nodes = [...this.toTree.toTree(data.result.items)]
         resolve(data)
-        this.getAllUsers()
-        console.log(this.nodes);
-        
-        this.defaultExpandedKeys = [this.nodes[0].id]
-        this.defaultExpandedKeys = [...this.defaultExpandedKeys]
       })
     })
   }
@@ -114,10 +104,9 @@ export class UserComponent implements OnInit {
     }
     this.getAllUsers()
   }
-  nzClick(event: NzFormatEmitEvent) {
+  nzClick(event: NzFormatEmitEvent){
     console.log(event);
-    this.OrganizaiotnId = event.node.origin.id
+    
-    this.getAllUsers()
   }
   //新增用户
   addUser(): void {