Merge remote-tracking branch 'origin/master'

app/Filters/OrderIssueFilters.php

@@ -427,7 +427,7 @@ class OrderIssueFilters
         $this->searchWay($order_issue_query, $sendOrderLogisticNumber, 'second_logistic_number');
         $order_issues = $order_issue_query->get();
         if (count($order_issues) > 0) {
-            $this->queryBuilder->where('order_issues.id', $order_issues->map(function ($orderIssue) {
+            $this->queryBuilder->whereIn('order_issues.id', $order_issues->map(function ($orderIssue) {
                 return $orderIssue->id;
             }));
         }
@@ -436,7 +436,7 @@ class OrderIssueFilters
             $this->searchWay($query, $sendOrderLogisticNumber, 'logistic_number');
         })->get();
         if ($orders->count() > 0) {
-            $this->queryBuilder->where('order_issues.second_client_no', $orders->map(function ($order) {
+            $this->queryBuilder->whereIn('order_issues.second_client_no', $orders->map(function ($order) {
                 return $order->client_code;
             }));
         }