更新

app/Admin/Controllers/ChatListController.php

@@ -17,20 +17,22 @@ class ChatListController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new ChatList(), function (Grid $grid) {
-            $grid->column('id')->sortable();
-            $grid->column('user_id');
-            $grid->column('to_user_id');
-            $grid->column('last_msg');
-            $grid->column('last_time');
-            $grid->column('atime');
-            $grid->column('un_read');
-        
-            $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('id');
-        
-            });
+        $grid = new Grid(new ChatList());
+        $grid->model()->with(['user','user_info','to_user','to_user_info'])->orderBy('id','desc');
+
+        $grid->column('id')->sortable();
+        $grid->column('user_id');
+        $grid->column('to_user_id');
+        $grid->column('last_msg');
+        $grid->column('last_time');
+        $grid->column('atime');
+        $grid->column('un_read');
+
+        $grid->filter(function (Grid\Filter $filter) {
+            $filter->equal('id');
+
         });
+        return $grid;
     }
 
     /**

app/Models/ChatList.php

@@ -14,4 +14,24 @@ class ChatList extends Model
     protected $fillable = ['user_id', 'to_user_id','last_msg','last_time','atime','un_read'];
     public $timestamps = false;
 
+
+    public function user()
+    {
+        return $this->belongsTo(User::class,'user_id','id');
+    }
+
+    public function user_info()
+    {
+        return $this->belongsTo(UserInfoModel::class,'user_id','user_id');
+    }
+
+    public function to_user()
+    {
+        return $this->belongsTo(User::class,'to_user_id','id');
+    }
+
+    public function to_user_info()
+    {
+        return $this->belongsTo(UserInfoModel::class,'to_user_id','user_id');
+    }
 }

app/Services/NoticeService.php

@@ -53,14 +53,6 @@ class NoticeService
     public function get_zan_list($param){
         $query = DynamicZanModel::query();
         if($param['type']==1){
-            //我赞了他
-            $query = $query->with(['dynamic'=>function($query){
-                $query->select('id','content','img_url');
-            },'dynamic.user'=>function($querty){
-                $querty->select('id','sex','is_vip','tencent_im_user_id');
-            },'dynamic.user_info'])
-            ->where('user_id',$param['user_id']);
-        }else{
             //他赞了我
             $query = $query->with(['dynamic'])->whereHas('dynamic',function ($query)use($param){
                 $query->where('user_id',$param['user_id'])->select();
@@ -70,6 +62,15 @@ class NoticeService
             DynamicZanModel::query()->with(['dynamic'])->where('status','=',0)->whereHas('dynamic',function ($query)use($param){
                 $query->where('user_id',$param['user_id'])->select('id','user_id','content','img_url');
             })->update(['status'=>1]);
+        }else{
+
+            //我赞了他
+            $query = $query->with(['dynamic'=>function($query){
+                $query->select('id','content','img_url');
+            },'dynamic.user'=>function($querty){
+                $querty->select('id','sex','is_vip','tencent_im_user_id');
+            },'dynamic.user_info'])
+                ->where('user_id',$param['user_id']);
         }
         $query = $query->orderByDesc('id')
             ->paginate(request('perPage',20));