Commit ec90a8fc ec90a8fcb599b46a3de693781ef12b10f1447e89 by lemon

上传

1 parent 9ed22653
......@@ -41,8 +41,8 @@ class PropertyTrackService extends Service
public function list()
{
$res = PropertyTrack::query()->where(['create_admin'=>$this->request->get('identifier')->company_id, 'from'=>1])
->when(filled($this->request->input('upload_time')), function (Builder $builder){
list($start, $end) = explode(' - ', $this->request->input('upload_time'));
->when(filled($this->request->input('created_at')), function (Builder $builder){
list($start, $end) = explode(' - ', $this->request->input('created_at'));
$builder->whereBetween('upload_time', [trim($start), trim($end)]);
})
->when(filled($this->request->input('song_name')), function (Builder $builder){
......