From 39832ce94f4869305356dda94709953abad05a6e Mon Sep 17 00:00:00 2001
From: Sjh <55341701@qq.com>
Date: Thu, 30 May 2024 17:16:25 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E9=A2=84?=
 =?UTF-8?q?=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.config.json                                     |  2 +-
 src/app/app.component.ts                              |  8 ++++++--
 src/app/ui/usermanagement/seeInformation.html         | 10 +++++-----
 src/app/ui/usermanagement/usermanagement.component.ts |  5 ++++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/proxy.config.json b/proxy.config.json
index 8129e12..1016789 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "http://121.36.37.70:8201/",
+    "target": "http://218.75.214.31:28085/",
     "生产": "http://10.81.73.39:8000/",
     "测试": "http://121.36.37.70:8201/",
     "生产2": "http://183.194.244.232:8088/",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index f5fbc97..e5a06fa 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -20,12 +20,13 @@ export class AppComponent {
     private injector: Injector
   ) {
     global.injector = injector;
-  } 
+  }
 
   isMaskLayerShow: boolean = false;
 
   ngOnInit(): void {
-    console.log("更新日期2024.1.12");
+    console.log("更新日期2024.5.27");
+    
     //监听遮罩层
     this.maskLayerService.getMessage().subscribe((message: any) => {
       this.isMaskLayerShow = message;
@@ -54,4 +55,7 @@ export class AppComponent {
       this.token.startUp();
     }
   }
+
+
+
 }
diff --git a/src/app/ui/usermanagement/seeInformation.html b/src/app/ui/usermanagement/seeInformation.html
index a627ce7..f7349ee 100644
--- a/src/app/ui/usermanagement/seeInformation.html
+++ b/src/app/ui/usermanagement/seeInformation.html
@@ -1,4 +1,4 @@
-<span  mat-dialog-title>查看用户</span>
+<span mat-dialog-title>查看用户</span>
 
 <div mat-dialog-content>
     <mat-list role="list">
@@ -11,13 +11,13 @@
         <mat-list-item role="listitem">所属机构:
             <span class="maginleft">{{data.organizationName}}</span>
         </mat-list-item>
-        <mat-list-item role="listitem">所属角色:  
+        <mat-list-item role="listitem">所属角色:
             <span *ngFor="let item of data.roleNames" class="maginleft">{{item}}</span>
         </mat-list-item>
-        <mat-list-item role="listitem">创建时间:  
-            <span class="maginleft">{{data.creationTime|date:'yyyy-MM-dd'}}</span>
+        <mat-list-item role="listitem">创建时间:
+            <span class="maginleft">{{data.creationTime | date:'yyyy-MM-dd'}}</span>
         </mat-list-item>
-        <mat-list-item role="listitem">是否禁用:  
+        <mat-list-item role="listitem">是否禁用:
             <span class="maginleft" *ngIf="data.enabled">否</span>
             <span class="maginleft" *ngIf="!data.enabled">是</span>
         </mat-list-item>
diff --git a/src/app/ui/usermanagement/usermanagement.component.ts b/src/app/ui/usermanagement/usermanagement.component.ts
index f9d2d46..3e117b6 100644
--- a/src/app/ui/usermanagement/usermanagement.component.ts
+++ b/src/app/ui/usermanagement/usermanagement.component.ts
@@ -29,6 +29,7 @@ export class UsermanagementComponent implements OnInit {
     public snackBar: MatSnackBar,
     private tree: TreeService
   ) {}
+  
   private _transformer = (node, level: number) => {
     //初始化tree
     return {
@@ -59,7 +60,7 @@ export class UsermanagementComponent implements OnInit {
 
   async ngOnInit() {
     await this.getAllMechanism();
-    console.log(88888, this.treedata);
+
     this.userMechanism = this.treedata[0].id;
 
     this.initData();
@@ -136,6 +137,7 @@ export class UsermanagementComponent implements OnInit {
       Name: this.userLogin || "",
       RealName: this.userName || "",
       OrganizationId: this.userMechanism || "",
+      HasChildren: "true",
       PageNumber: "1",
     };
     this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => {
@@ -152,6 +154,7 @@ export class UsermanagementComponent implements OnInit {
       Name: this.userLogin || "",
       RealName: this.userName || "",
       OrganizationId: this.userMechanism || "",
+      HasChildren: "true",
       PageNumber: String(this.pageNumber),
     };
     this.http.get("/api/Users", { params: data }).subscribe((data: any[]) => {