补充提交

app/Services/OrderService.php

@@ -231,6 +231,7 @@ class OrderService
                 ->getOrderno(['checktime_start'=>$checktime_start,'checktime_end'=>$checktime_end,
                     'paginate'=>$paginate,'page'=>$page]);
             if ($ordernos)$params['ordernos'] = $ordernos;
+            else return null;
         }
         $sql="select ACT_ALLOCATION_DETAILS.CHECKTIME,DOC_ORDER_HEADER.addtime,DOC_ORDER_HEADER.C_PROVINCE,DOC_ORDER_HEADER.C_CITY,DOC_ORDER_HEADER.C_DISTRICT,DOC_ORDER_HEADER.C_CONTACT,DOC_ORDER_HEADER.OrderNo,DOC_ORDER_HEADER.SOStatus,DOC_ORDER_HEADER.WAREHOUSEID,DOC_ORDER_HEADER.CustomerID
         ,DOC_ORDER_HEADER.C_Tel2,DOC_ORDER_HEADER.C_Tel1,DOC_ORDER_HEADER.CarrierName,DOC_ORDER_HEADER.IssuePartyName,DOC_ORDER_HEADER.EDIREMARKS2,
@@ -308,13 +309,15 @@ class OrderService
         }
 
         $sql = $this->getSql($params,$params['page'] ?? 1, $params['paginate'] ?? 50);
-        $orders=DB::connection('oracle')->select(DB::raw($sql));
+        if ($sql)$orders=DB::connection('oracle')->select(DB::raw($sql));
+        else $orders = [];
         return $this->orderFormat($orders);
     }
 
     public function get(array $params){
         $sql = $this->getSql($params);
-        $orders=DB::connection('oracle')->select(DB::raw($sql));
+        if ($sql)$orders=DB::connection('oracle')->select(DB::raw($sql));
+        else $orders = [];
         return $this->orderFormat($orders);
     }