zilong 4 år sedan
förälder
incheckning
ba74890262
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      app/Models/ImMessage.php

+ 2 - 1
app/Models/ImMessage.php

xqd
@@ -23,8 +23,9 @@ class ImMessage extends BaseModel
         if (!empty($start_time)) {
             $end_time = !empty($order['end_time']) ? $order['end_time'] : time();
             $end_time = $end_time*1000;
-            $data = ImMessage::whereIn('senderId', [$docterImId, $userImId])->whereIn('receiverId', [$docterImId, $userImId])->whereBetween('timestamp', [$start_time, $end_time])->orderBy('timestamp', 'asc')->get()->toArray();
+            $data = ImMessage::whereIn('senderId', [$docterImId, $userImId])->whereIn('receiverId', [$docterImId, $userImId])->whereBetween('timestamp', [$start_time, $end_time])->orderBy('timestamp', 'asc')->get();
             if (!empty($data)) {
+                $data = $data->toArray();
                 $user = User::select(['nickname', 'avatar'])->where('id', $order['user_id'])->first();
                 $docter = Docter::select(['name', 'avatar'])->where('id', $order['docter_id'])->first();
                 foreach ($data as $k => &$v) {