diff --git a/app/Admin/Controllers/v3/Salesman.php b/app/Admin/Controllers/v3/Salesman.php index 3b9e066..1a479cf 100644 --- a/app/Admin/Controllers/v3/Salesman.php +++ b/app/Admin/Controllers/v3/Salesman.php @@ -87,6 +87,7 @@ class Salesman extends AdminController $grid->disableDeleteButton(); $grid->disableViewButton(); $grid->filter(function (Grid\Filter $filter)use ($option) { + $filter->equal('person_id','懒ID'); $filter->equal('user_id','拓展员')->select( LanzuEmployees::where('status',1)->pluck('name','user_id') ); diff --git a/app/Admin/Repositories/v3/Salesman.php b/app/Admin/Repositories/v3/Salesman.php index 697b9b9..efe9fd0 100644 --- a/app/Admin/Repositories/v3/Salesman.php +++ b/app/Admin/Repositories/v3/Salesman.php @@ -24,7 +24,8 @@ class Salesman extends EloquentRepository $userId = $row->person_id; } }else{ - $userId = $model->filter()->input('user_id'); + $personId = $model->filter()->input('person_id'); + $userId = $personId??$model->filter()->input('user_id'); } $build = LanzuCsInfo::select(