Commit 4fc4db04 4fc4db04317f5a18d433c02caac235fb6cfd7693 by lemon

*

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