diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php index 1c3ec45..66a0040 100644 --- a/app/crm/service/StockOrdersService.php +++ b/app/crm/service/StockOrdersService.php @@ -61,7 +61,7 @@ class StockOrdersService extends \app\common\service\StockOrdersService $user_role_id = UserRoles::where('user_id', $request->user->uid)->pluck('role_id')->toArray(); //$roles_id = array_intersect([1,6], $request->user->role_ids); - $roles_id = array_intersect([1,5,6], $user_role_id); + $roles_id = array_intersect([1,4,5,6], $user_role_id); if (count($roles_id) != 0){ // if(in_array(4, $request->user->role_ids)){ //业务主管 // $report = User::where('report_to',$request->user->uid)->pluck('id')->toArray(); @@ -88,6 +88,10 @@ class StockOrdersService extends \app\common\service\StockOrdersService $config['orWhere'][] = ['approval_status','>=',1]; $config['orWhere'][] = ['salesperson_id','=',$request->user->uid]; unset($config['where']['salesperson_id']); + } elseif (in_array(4,$roles_id)) { //业务主管:自己+直属下属(report_to指向他,一级,含草稿) + $report = User::where('report_to',$request->user->uid)->pluck('id')->toArray(); + $report[] = $request->user->uid; + $config['where']['salesperson_id'] = ['in',$report]; }else{ $config['where']['salesperson_id'] = $request->user->uid; }