Ken 15 цаг өмнө
parent
commit
73138cef61

+ 1 - 0
app/Http/Controllers/admin/ActivityUser.php

@@ -74,6 +74,7 @@ class ActivityUser extends Controller
             $query = ActivityUserModel::where($where);
             $query = ActivityUserModel::where($where);
             $count = $query->count();
             $count = $query->count();
             $list = $query->orderBy('status')
             $list = $query->orderBy('status')
+                ->with(['member'])
                 ->orderByDesc('id')
                 ->orderByDesc('id')
                 ->forPage($page, $limit)->get()->toArray();
                 ->forPage($page, $limit)->get()->toArray();
             $result = ['total' => $count, 'data' => $list];
             $result = ['total' => $count, 'data' => $list];

+ 8 - 0
app/Models/ActivityUser.php

@@ -35,6 +35,14 @@ class ActivityUser extends BaseModel
     const STATUS_IN_PROGRESS = 1;
     const STATUS_IN_PROGRESS = 1;
     const STATUS_COMPLETE = 2;
     const STATUS_COMPLETE = 2;
 
 
+
+    public function member()
+    {
+        return $this->belongsTo(User::class, 'member_id', 'member_id')
+            ->select(['id', 'member_id', 'username', 'first_name', 'status']);
+    }
+
+
     protected function getDetailImageAttribute($value)
     protected function getDetailImageAttribute($value)
     {
     {
         return Util::ensureUrl($value);
         return Util::ensureUrl($value);