AOKB/onboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Форматирование

Browse Source
This commit is contained in:
brusnitsyn
2026-04-24 16:46:10 +09:00
parent fd0e6ee817
commit 63daa62888
87 changed files with 1380 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Models/User.php
View File

@@ -5,7 +5,6 @@ namespace App\Models;
// use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -17,7 +16,7 @@ use Laravel\Sanctum\HasApiTokens;
class User extends Authenticatable
{
/** @use HasFactory<\Database\Factories\UserFactory> */
use HasFactory, Notifiable, HasApiTokens;
use HasApiTokens, HasFactory, Notifiable;
/**
* The attributes that are mass assignable.
@@ -30,7 +29,7 @@ class User extends Authenticatable
'password',
'rf_lpudoctor_id',
'rf_department_id',
'current_role_id'
'current_role_id',
];
/**
@@ -99,10 +98,10 @@ class User extends Authenticatable
$sessionId = session()->getId();
$token = Auth::user()->currentAccessToken();
// $sessionKey = 'user_' . $this->id . '_current_role';
// $roleId = $this->current_role_id ?? $defaultRoleId;
//
// $role = Role::where('role_id', $roleId)->first();
// $sessionKey = 'user_' . $this->id . '_current_role';
// $roleId = $this->current_role_id ?? $defaultRoleId;
//
// $role = Role::where('role_id', $roleId)->first();
if ($token) {
foreach ($token->abilities as $ability) {
@@ -121,7 +120,7 @@ class User extends Authenticatable
$sessionRoleId = DB::table('sessions')->where('id', $sessionId)->value('role_id');
$roleId = $sessionRoleId ?? $defaultRoleId;
// dd($sessionId);
// dd($sessionId);
$role = Role::where('role_id', $roleId)->first();
return $role;