Commit 4fc4db04 4fc4db04317f5a18d433c02caac235fb6cfd7693 by lemon

*

1 parent 23e68266
......@@ -27,11 +27,11 @@ class PropertyTrackService extends Service
{
$res = PropertyTrack::query()->where(['create_admin'=>$this->identifier->company_id, 'from'=>1])
->when(filled($this->request->input('upload_time')), function (Builder $builder){
list($start, $end) = explode('-', $this->request->input('upload_time'));
list($start, $end) = explode(' - ', $this->request->input('upload_time'));
$builder->whereBetween('upload_time', [trim($start), trim($end)]);
})
->when(filled($this->request->input('song_name')), function (Builder $builder){
$builder->where('like', 'like', "%{$this->request->input('song_name')}%");
$builder->where('song_name', 'like', "%{$this->request->input('song_name')}%");
})->orderByDesc('id')->paginate($this->pageSize);
return Response::success($res);
......@@ -66,7 +66,7 @@ class PropertyTrackService extends Service
}
/**
* 歌曲上传文件列表 (不登录)
* 歌曲上传文件列表
* @return \Illuminate\Http\JsonResponse
*/
public function file()
......