liuzejian 1 rok pred
rodič
commit
b0d637d9cc

+ 2 - 2
modules/Video/Http/Controllers/VideoController.php

@@ -28,7 +28,7 @@ class VideoController extends CatchController
         $updateType = $request->input('updateType');
         $categoryId = $request->input('categoryId');
         $videoId = $request->input('videoId');
-        $wechatPass = $request->input('wechatPass', 0);
+        $wechatPass = $request->input('wechatPass');
 
         $videos = DB::table('videos')
             ->when($videoId, function ($query, $videoId){
@@ -40,7 +40,7 @@ class VideoController extends CatchController
                 return $query->where('update_type', $updateType);
             })->when($categoryId, function ($query, $categoryId){
                 return $query->where('category_id', $categoryId);
-            })->when($wechatPass, function ($query, $wechatPass) {
+            })->when(!is_null($wechatPass), function ($query) use ($wechatPass) {
                 return $query->where('wechat_pass', $wechatPass);
             })
             ->orderBy('id', 'desc')

+ 1 - 0
tests/Video/Http/Controllers/VideoControllerTest.php

@@ -63,6 +63,7 @@ class VideoControllerTest extends UsedTestCase
 //        'updateType' => 2,
 //        'categoryId' => 4,
 //            'operateUserId' =>10
+            'wechatPass' => ''
         ]);
 //        $this->dumpJson($res);
         $res->dump();