用户列表根据货主筛选,及采购模型状态修改

app/Http/Controllers/UserController.php

@@ -42,11 +42,11 @@ class UserController extends Controller
         if($request->has('owner_id')){
             $owner_id= $request->input('owner_id');
             $owner_ids = array_filter(preg_split('/[,， ]+/is',$owner_id));
-            $ids=[];
-            foreach ($owner_ids as $id)$ids[]='_'.$id;
-            $query->whereHas('roles',function($query) use ($ids){
-                $query->whereHas('authorities',function ($query)use($ids){
-                    $query->whereIn('name',$ids);
+            $ownerIds=[];
+            foreach ($owner_ids as $id)$ownerIds[]='_'.$id;
+            $query->whereHas('roles',function($query) use ($ownerIds){
+                $query->whereHas('authorities',function ($query)use($ownerIds){
+                    $query->whereIn('name',$ownerIds);
                 });
             });
         }

app/Http/Controllers/api/thirdPart/weixin/ProcurementController.php

@@ -41,19 +41,17 @@ class ProcurementController extends Controller
                 });
             })
             ->get();
-        $keys = [];
+
         foreach ($procurements as $key=>$procurement){
-//            if ($procurement->procurement_quotations_count>0 && $status==0 )$keys[]= $key;
             if ($procurement->procurement_quotations_count>0 && !$user->isSuperAdmin()){
                 foreach ($procurement->procurementQuotations as $procurementQuotation){
-                    if (in_array($procurementQuotation->supplier_id,$supplier_ids))$keys[]= $key;
+                    if (in_array($procurementQuotation->supplier_id,$supplier_ids))unset($procurements[$key]);
                 }
             }
-            if ($procurement->type==2 && $procurement->supplier_id )$keys[]= $key;
+            if ($procurement->type==2 && $procurement->supplier_id )unset($procurements[$key]);
             if (Carbon::parse($procurement->deadline)->gt(Carbon::now())) $procurement->deadline=Carbon::parse($procurement->deadline)->diffInMilliseconds();
             else $procurement->deadline=0;
         }
-        $procurements = $procurements->diffKeys($keys);
         if (!empty($procurements)) return $this->success($procurements);
     }
 

app/Procurement.php

@@ -29,7 +29,7 @@ class Procurement extends Model
         1 => "已报价",
         2 => "待接单",
         3 => "已失效",
-        4 => "生成中",
+        4 => "生产中",
         5 => "待收货",
         6 => "待确定",
         7 => "待出账",