优化代码

app/model/Member.php

@@ -74,7 +74,7 @@ class Member extends Model {
 	}
 
 	protected function getAvatarAttr($value, $data) {
-		return avatar($data['uid']);
+		return $value ? $value : request()->domain() . '/static/common/images/default_avatar.jpg';
 	}
 
 	protected function setPasswordAttr($value, $data) {
@@ -90,6 +90,10 @@ class Member extends Model {
 		return JWTAuth::builder($token); //参数为用户认证的信息，请自行添加
 	}
 
+	protected function getNicknameAttr($value, $data){
+		return $value ? $value : $data['username'];
+	}
+
 	/**
 	 * 用户登录
 	 */
@@ -191,17 +195,26 @@ class Member extends Model {
 			}];
 		}
 
-		$list = self::with(['role'])->field('uid,username,nickname,status,email,mobile,department,reg_time')->where($map)->order($order)->paginate($request->pageConfig);
-		return $list->append(['avatar', 'status_text']);
+		$res = self::with(['role', 'group'])->field('uid,username,nickname,status,email,mobile,department,reg_time')->where($map)->order($order)->paginate($request->pageConfig);
+		$list = $res->append(['avatar', 'status_text'])->each(function($item){
+			if($item['group'] === null){
+				$item['group'] = ['title' => '未定义'];
+				$item['group_title'] = '未定义';
+			}else{
+				$item['group_title'] = $item['group']['title'];
+			}
+			return $item;
+		});
+		return $list;
 	}
 
 	/**
 	 * @title: 获取用户列表
 	 */
 	public function getUserDetail($request) {
-		$uid = $request->param('uid', $request->user['uid']);
+		$uid = $request->param('uid');
 		if (!$uid) {
-			return false;
+			$uid = $request->user['uid'];
 		}
 
 		$info = $this->where('uid', $uid)->find();
@@ -255,4 +268,8 @@ class Member extends Model {
 	public function role() {
 		return $this->hasOne('RoleAccess', 'uid', 'uid');
 	}
+
+	public function group(){
+		return $this->hasOneThrough(AuthGroup::class, AuthGroupAccess::class, 'uid', 'id', 'uid', 'group_id');
+	}
 }