会员赠礼管理刷选条件修改

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -593,7 +593,7 @@ class CustomerDepositController extends Controller
      */
     public function monthGiftList(Request $request) {
         $page = $request->input('page',1);
-        $type = $request->input('type');
+        $type = $request->input('type','-1');
         $pageSize = 20;
         if($page<=0){
             $page = 1;
@@ -601,7 +601,7 @@ class CustomerDepositController extends Controller
 
         $offset = ($page-1) * $pageSize;
         $count = CustomerMonthGift::where(function($query) use ($type) {
-            if($type && ($type != '-1')) $query->where('type',$type);
+            if($type != '-1') $query->where('type',$type);
         })->count();
         if ($count > 1) {
             // 总页数
@@ -611,7 +611,7 @@ class CustomerDepositController extends Controller
             $pages = 1;
         }
         $result = CustomerMonthGift::where(function($query) use ($type) {
-            if($type && ($type != '-1')) $query->where('type',$type);
+            if($type != '-1') $query->where('type',$type);
         })->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
         $result = array_map(function($value){