|
@@ -66,7 +66,7 @@ class MeetingService extends BaseService
|
|
|
return $info;
|
|
return $info;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $info = $this->model->with(['member'])
|
|
|
|
|
|
|
+ $info = $this->model->with(['member','company'])
|
|
|
->where(['id'=>$id,'status'=>1,'mark'=>1])
|
|
->where(['id'=>$id,'status'=>1,'mark'=>1])
|
|
|
->withCount(['records'])
|
|
->withCount(['records'])
|
|
|
->first();
|
|
->first();
|
|
@@ -152,7 +152,7 @@ class MeetingService extends BaseService
|
|
|
unset($where['meetings.status']);
|
|
unset($where['meetings.status']);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- return $this->model->with(['member'])
|
|
|
|
|
|
|
+ return $this->model->with(['member','company'])
|
|
|
->from('meetings')
|
|
->from('meetings')
|
|
|
->leftJoin('meetings_records','meetings_records.meeting_id','meetings.id')
|
|
->leftJoin('meetings_records','meetings_records.meeting_id','meetings.id')
|
|
|
->where($where)
|
|
->where($where)
|
