| xqd
@@ -23,9 +23,8 @@ 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();
|
|
|
+ $data = ImMessage::whereIn('senderId', [$docterImId, $userImId])->whereIn('receiverId', [$docterImId, $userImId])->whereBetween('timestamp', [$start_time, $end_time])->orderBy('timestamp', 'asc')->get()->toArray();
|
|
|
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) {
|