diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php index f01f3b2..ea09300 100644 --- a/app/crm/service/StockOrdersService.php +++ b/app/crm/service/StockOrdersService.php @@ -40,14 +40,16 @@ 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,6], $user_role_id); - if (count($roles_id) == 0){ + $roles_id = array_intersect([1,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(); // $report = array_merge($report, [$request->user->uid]); // $config['where']['salesperson_id'] = ['in',$report]; // } else - if (in_array(5, $request->user->role_ids)){ //内勤 + + //内勤分组的人可以看到自己分组的备货单 + if (in_array(5,$roles_id)){ //内勤 $userGroupMember = UserGroupMembers::where('user_id',$request->user->uid) ->where('is_leader',1) ->first(); @@ -55,7 +57,6 @@ class StockOrdersService extends \app\common\service\StockOrdersService $report = UserGroupMembers::where('group_id',$userGroupMember->group_id) ->pluck('user_id') ->toArray(); - $report = array_merge($report, [$request->user->uid]); $config['where']['salesperson_id'] = ['in',$report]; }else{ //内勤没有负责的组时 $config['where']['salesperson_id'] = $request->user->uid;