From e2910d287afd8645a82c7296b2b0140942b32a98 Mon Sep 17 00:00:00 2001
From: molong <ycgpp@126.com>
Date: Fri, 2 Dec 2016 10:12:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/user/index.html |  4 ++++
 application/common/model/User.php      | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/admin/view/user/index.html b/application/admin/view/user/index.html
index 868f8658..d49249ed 100644
--- a/application/admin/view/user/index.html
+++ b/application/admin/view/user/index.html
@@ -23,6 +23,9 @@
 						<th>
 							<span>手机号码</span>
 						</th>
+						<th>
+							<span>授权分组</span>
+						</th>
 						<th>
 							<span>创建时间</span>
 						</th>
@@ -46,6 +49,7 @@
 						<td>
 							<span >{$item['mobile']}</span>
 						</td>
+						<td>{$item['group_list']|implode=',',###}</td>
 						<td>{$item['reg_time']|date='Y-m-d',###}</td>
 						<td class="text-center">
 							{if condition="$item['status']"}
diff --git a/application/common/model/User.php b/application/common/model/User.php
index ae8bed2a..eb8f40b8 100644
--- a/application/common/model/User.php
+++ b/application/common/model/User.php
@@ -72,6 +72,11 @@ class User extends Base{
 		return md5($value.$data['salt']);
 	}
 
+	protected function getGroupListAttr($value, $data){
+		$sql = db('AuthGroupAccess')->where('uid', $data['uid'])->fetchSql(true)->column('group_id');
+		return db('AuthGroup')->where('id in ('.$sql.')')->column('title', 'id');
+	}
+
 	/**
 	* 用户登录模型
 	*/
@@ -175,11 +180,7 @@ class User extends Base{
 
 	public function getInfo($uid){
 		$data = $this->where(array('uid'=>$uid))->find();
-		if ($data) {
-			return $data->toArray();
-		}else{
-			return false;
-		}
+		return $data;
 	}
 
 	/**