Merge branch 'hotfix/stock' into develop
This commit is contained in:
@@ -38,11 +38,12 @@ class StockOrdersService extends \app\common\service\StockOrdersService
|
||||
|
||||
$roles_id = array_intersect([1,6], $request->user->role_ids);
|
||||
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];
|
||||
} elseif (in_array(5, $request->user->role_ids)){ //内勤
|
||||
// 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)){ //内勤
|
||||
$userGroupMember = UserGroupMembers::where('user_id',$request->user->uid)
|
||||
->where('is_leader',1)
|
||||
->first();
|
||||
|
||||
Reference in New Issue
Block a user