修改管理员列表

app/admin/controller/Admin.php

@@ -28,7 +28,7 @@ class Admin extends BaseController
     {
         try {
             $params = $this->request->param();
-            $query = AdminModel::alias('admin');
+            $query = new AdminModel();
             if (!empty($params['username'])) {
                 $query = $query->where('username', 'like', "%{$params['username']}%");
             }
@@ -49,13 +49,15 @@ class Admin extends BaseController
             $limit = isset($params['limit']) ? intval($params['limit']) : 15;
 
             $count = $query->count();
-            $list = $query->with(['role', 'department'])
-                ->join('user', 'user.uid=admin.id','left')
-                ->field('admin.*,user.avatar')
+            $list = $query->with(['role', 'department','user'])
                 ->order('id', 'desc')
                 ->limit($limit)
                 ->page($page)
                 ->select();
+            
+            foreach($list as &$item) {
+                $item['avatar'] = $item['user']['avatar'];
+            }
 
         } catch (\Exception $e) {
             return $this->error('查询失败：'.$e->getMessage());