From b8e2e1524169d0008accf22f2e796495ad45a378 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 04 Jan 2018 16:06:40 +0800
Subject: [PATCH] 账户管理

---
 src/app/routes/systems/account/account.component.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/systems/account/account.component.html b/src/app/routes/systems/account/account.component.html
index 5c458ac..b78dc77 100644
--- a/src/app/routes/systems/account/account.component.html
+++ b/src/app/routes/systems/account/account.component.html
@@ -61,7 +61,7 @@
 
 	<nz-table   #nzTable
 				[nzAjaxData]="data"
-				[nzLoading]="http.loading"
+				[nzLoading]="loading"
 				[nzTotal]="total"
 				[(nzPageIndex)]="query.pageIndex"
 				[nzPageSize]="query.pageSize"
@@ -98,7 +98,7 @@
 				<td nz-td>{{account.email}}</td>
 				<td nz-td>{{account.weixin}}</td>
 				<!-- <td nz-td>{{account.password}}</td> -->
-				<td nz-td>{{account.organizationId}}</td>
+				<td nz-td>{{account.organization?account.organization.name:account.organizationId}}</td>
 				<td nz-td>{{format_date(account.createTime)}}</td>
 				<td nz-td>{{format_date(account.expireTime)}}</td>
 				<td nz-td>

--
Gitblit v1.8.0