Wesmiler

app/Services/Api/AccountService.php

@@ -238,9 +238,6 @@ class AccountService extends BaseService
             if($phoneType){
                 $where['phone_type'] = $phoneType;
             }
-            if($phoneService){
-                $where['phone_service'] = $phoneService;
-            }
         }else if($type==2){
             if($electricType){
                 $where['electric_type'] = $electricType;
@@ -252,6 +249,11 @@ class AccountService extends BaseService
         }
 
         $datas = PayMealsModel::where($where)
+            ->where(function($query) use($phoneService, $type){
+                if($type==1 && $phoneService){
+                    $query->where('phone_service',$phoneService)->orWhere('phone_service',0);
+                }
+            })
             ->orderBy('sort','desc')
             ->orderBy('id','asc')
             ->get();