diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 5bd60cf..f4aab85 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -215,9 +215,13 @@ class UserService $config['where']['status'] = $p['status']; } - $config['dataLimit']['type'] = 'relation'; - $config['dataLimit']['userId'] = $request->user->uid; - $config['dataLimit']['userField'] = 'report_to'; + if (!in_array(1, $request->user->role_ids)) { + $config['with']= ['reportToInfo']; + } + + // $config['dataLimit']['type'] = 'relation'; + // $config['dataLimit']['userId'] = $request->user->uid; + // $config['dataLimit']['userField'] = 'report_to'; break; }