diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php index a1c936e..6d1b906 100644 --- a/app/Admin/Forms/SelectHorseman.php +++ b/app/Admin/Forms/SelectHorseman.php @@ -2,6 +2,7 @@ namespace App\Admin\Forms; +use App\Admin\Common\Auth; use App\Models\ImsCjdcOrderMain; use App\Models\LanzuServiceHorseman; use App\Models\v3\LanzuEmployees; @@ -41,7 +42,7 @@ class SelectHorseman extends Form public function form() { $this->select('horseman_id','配送员') - ->options(LanzuEmployees::getHorseman()) + ->options(LanzuEmployees::getHorseman(Auth::getMarket())) ->required(); $this->hidden('order_id'); diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php index 5592698..8bf0755 100644 --- a/app/Models/v3/LanzuEmployees.php +++ b/app/Models/v3/LanzuEmployees.php @@ -75,9 +75,10 @@ class LanzuEmployees extends Model if ($marketId){ $rows = self::where('market_id',$marketId) ->where('position','REGEXP','"29"') + ->where('status',1) ->get(); }else{ - $rows = self::where('position','REGEXP','"29"')->get(); + $rows = self::where('position','REGEXP','"29"')->where('status',1)->get(); } $item = []; if ($rows){