This commit is contained in:
Pig Fang 2018-09-14 15:46:44 +08:00
parent 764c4ae94d
commit eedb7e8449

View File

@ -282,7 +282,7 @@ if (! function_exists('bs_nickname')) {
function bs_nickname(User $user = null)
{
$user = $user ?: app('users')->getCurrentUser();
$user = $user ?: auth()->user();
return ($user->getNickName() == '') ? $user->email : $user->getNickName();
}
@ -292,7 +292,7 @@ if (! function_exists('bs_role')) {
function bs_role(User $user = null)
{
$user = $user ?: app('users')->getCurrentUser();
$user = $user ?: auth()->user();
$roles = [
User::NORMAL => 'normal',