临时提交

app/Filters/OrderIssueFilter.php

@@ -11,9 +11,11 @@ use App\OrderIssueProcessLog;
 use App\OrderPackage;
 use App\OrderPackageCommodities;
 use App\RejectedBillItem;
+use App\UserWorkgroup;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use PhpMyAdmin\Server\UserGroups;
 
 
 class OrderIssueFilter
@@ -28,6 +30,7 @@ class OrderIssueFilter
     protected $rejectedBillQuery;
     protected $rejectedBillItemQuery;
     protected $orderIssueProcessLogQuery;
+    protected $userWorkGroupQuery;
     protected $filters = [
         'log_content',
         'is_imported',
@@ -53,7 +56,8 @@ class OrderIssueFilter
         'settlement_at_start',
         'settlement_at_end',
         'sendOrderClientCode',
-        'sendOrderLogisticNumber'
+        'sendOrderLogisticNumber',
+        'user_workgroups'
     ];
     protected $array_filter;
     protected $params = [];
@@ -123,6 +127,13 @@ class OrderIssueFilter
         return $this->orderIssueProcessLogQuery;
     }
 
+    private function getUserWorkGroupQuery()
+    {
+        if(!$this->userWorkGroupQuery)
+            $this->userWorkGroupQuery = UserWorkgroup::query()->selectRaw('id');
+        return $this->userWorkGroupQuery;
+    }
+
     public function apply($builder)
     {
         $this->queryBuilder = $builder;
@@ -324,6 +335,11 @@ class OrderIssueFilter
         $this->searchWay($this->queryBuilder,$sendOrderClientCode,'order_issues.second_client_no');
     }
 
+    public function user_workgroups($user_workgroups)
+    {
+        $this->searchWay($this->getUserWorkGroupQuery(),$user_workgroups,'id');
+    }
+
     public function sendOrderLogisticNumber($sendOrderLogisticNumber)
     {
         $order_issue_query = OrderIssue::query()->selectRaw('id');