Commit c3ebb633 by 杨昕

测试

parent 2245b168
Pipeline #9891 passed with stages
in 33 seconds
......@@ -10,16 +10,29 @@ use App\Http\Controllers\Controller;
class MediaController extends Controller
{
/**
* 媒资列表
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \App\Exceptions\DatabaseException
* @throws \App\Exceptions\FormException
*/
public function index(Request $request){
// var_dump(\config('app.client_request_parameters'));die;
SrsHookValidate::srsHookCallback($request,[
'media_name' => '',
'username' => '',
'page' => 'integer',
'media_id' => '',
'description' => '',
'sort' => '',
'page_size' => 'integer',
'start_time' => 'date',
'end_time' => 'date',
]);
$medias = MediaModel::mediaList($request);
// return success($medias);
return view('admin.media.media_list', [
'medias' => $medias,
'start_time' => substr($request->start_time, 0, 10),
......
......@@ -52,11 +52,11 @@ class MediaModel extends Eloquent
$sort = 1;
}
if (isset($request->media_id) && empty($request->media_id)){
if (isset($request->media_id) && !empty($request->media_id)){
$aggregate[]['$match']['_id'] = $request->media_id;
}
if (isset($request->media_name) && empty($request->media_name)){
if (isset($request->media_name) && !empty($request->media_name)){
$aggregate[]['$match']['media_name'] = ['$regex' => $request->media_name ];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment