diff --git a/app/common/service/ApprovalRecordsService.php b/app/common/service/ApprovalRecordsService.php index 9cf87b6..c5ea74a 100644 --- a/app/common/service/ApprovalRecordsService.php +++ b/app/common/service/ApprovalRecordsService.php @@ -72,8 +72,8 @@ class ApprovalRecordsService ->where('is_leader',1) ->first(); if($userGroupMember){ - $report = UserGroupMembers::where('user_id',$request->user->uid) - ->pluck('id') + $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]; diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php index 449c182..b2b2654 100644 --- a/app/crm/service/StockOrdersService.php +++ b/app/crm/service/StockOrdersService.php @@ -47,8 +47,8 @@ class StockOrdersService extends \app\common\service\StockOrdersService ->where('is_leader',1) ->first(); if($userGroupMember){ - $report = UserGroupMembers::where('user_id',$request->user->uid) - ->pluck('id') + $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];