备货单与审批数据过滤
This commit is contained in:
@@ -56,13 +56,13 @@ class ApprovalRecordsService
|
|||||||
case 'todo':
|
case 'todo':
|
||||||
|
|
||||||
if ($p['scene'] === 'todo') {
|
if ($p['scene'] === 'todo') {
|
||||||
if (!in_array(1, $request->user->role_ids)) {
|
// 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']['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']['status'] = 'pending';
|
||||||
$config['where']['instance.status'] = 'processing';
|
$config['where']['instance.status'] = 'processing';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,11 +35,10 @@ class StockOrdersService extends \app\common\service\StockOrdersService
|
|||||||
|
|
||||||
$config['order']['id'] = 'desc';
|
$config['order']['id'] = 'desc';
|
||||||
|
|
||||||
// $roles_id = array_intersect([1,5,6], $request->user->role_ids);
|
$roles_id = array_intersect([1,5,6], $request->user->role_ids);
|
||||||
// if(count($roles_id) == 0){
|
if(count($roles_id) == 0){
|
||||||
// $config['where']['salesperson_id'] = $request->user->uid;
|
|
||||||
// }
|
|
||||||
$config['where']['salesperson_id'] = $request->user->uid;
|
$config['where']['salesperson_id'] = $request->user->uid;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'print':
|
case 'print':
|
||||||
case 'approval':
|
case 'approval':
|
||||||
|
|||||||
Reference in New Issue
Block a user