Merge branch 'master' into develop
This commit is contained in:
@@ -215,9 +215,13 @@ class UserService
|
|||||||
$config['where']['status'] = $p['status'];
|
$config['where']['status'] = $p['status'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$config['dataLimit']['type'] = 'relation';
|
if (!in_array(1, $request->user->role_ids)) {
|
||||||
$config['dataLimit']['userId'] = $request->user->uid;
|
$config['with']= ['reportToInfo'];
|
||||||
$config['dataLimit']['userField'] = 'report_to';
|
}
|
||||||
|
|
||||||
|
// $config['dataLimit']['type'] = 'relation';
|
||||||
|
// $config['dataLimit']['userId'] = $request->user->uid;
|
||||||
|
// $config['dataLimit']['userField'] = 'report_to';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user