diff --git a/app/common/service/ApprovalRecordsService.php b/app/common/service/ApprovalRecordsService.php index 4d837af..9853b9d 100644 --- a/app/common/service/ApprovalRecordsService.php +++ b/app/common/service/ApprovalRecordsService.php @@ -56,13 +56,13 @@ class ApprovalRecordsService case 'todo': if ($p['scene'] === 'todo') { - if (!in_array(1, $request->user->role_ids)) { - $config['where']['approver_id'] = $request->user->uid; - } -// $roles_id = array_intersect([1,5,6], $request->user->role_ids); -// if(count($roles_id) == 0){ +// if (!in_array(1, $request->user->role_ids)) { // $config['where']['approver_id'] = $request->user->uid; // } + $roles_id = array_intersect([1,5,6], $request->user->role_ids); + if(count($roles_id) == 0){ + $config['where']['approver_id'] = $request->user->uid; + } $config['where']['status'] = 'pending'; $config['where']['instance.status'] = 'processing'; } diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php index 1999cd7..cfd964a 100644 --- a/app/crm/service/StockOrdersService.php +++ b/app/crm/service/StockOrdersService.php @@ -35,11 +35,10 @@ class StockOrdersService extends \app\common\service\StockOrdersService $config['order']['id'] = 'desc'; -// $roles_id = array_intersect([1,5,6], $request->user->role_ids); -// if(count($roles_id) == 0){ -// $config['where']['salesperson_id'] = $request->user->uid; -// } - $config['where']['salesperson_id'] = $request->user->uid; + $roles_id = array_intersect([1,5,6], $request->user->role_ids); + if(count($roles_id) == 0){ + $config['where']['salesperson_id'] = $request->user->uid; + } break; case 'print': case 'approval':