Merge branch '1.9' into php8

This commit is contained in:
xiaomlove
2025-10-30 11:39:54 +07:00
7 changed files with 83 additions and 60 deletions

View File

@@ -177,7 +177,7 @@ class UserRepository extends BaseRepository
throw new \InvalidArgumentException("password confirmation != password");
}
$user = User::query()->findOrFail($id, ['id', 'username', 'class']);
$operator = Auth::user();
$operator = get_user_id();
if ($operator) {
$this->checkPermission($operator, $user);
}