Merge branch 'develop'
This commit is contained in:
@@ -56,9 +56,9 @@ class ApprovalRecordsService
|
||||
case 'todo':
|
||||
|
||||
if ($p['scene'] === 'todo') {
|
||||
// if (!in_array(1, $request->user->role_ids)) {
|
||||
// $config['where']['approver_id'] = $request->user->uid;
|
||||
// }
|
||||
if (!in_array(1, $request->user->role_ids)) {
|
||||
$config['where']['approver_id'] = $request->user->uid;
|
||||
}
|
||||
$config['where']['status'] = 'pending';
|
||||
$config['where']['instance.status'] = 'processing';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user