Merge branch 'master' into develop

This commit is contained in:
mzl
2025-11-13 11:42:34 +08:00
+7 -3
View File
@@ -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;
}