generated from liutk/owl-admin-base
main
parent
c6caa1f2dd
commit
3c52fb0f60
|
|
@ -60,11 +60,14 @@ class UserController extends Controller
|
||||||
{
|
{
|
||||||
$user = $this->guard()->user();
|
$user = $this->guard()->user();
|
||||||
$role = $user->userRole();
|
$role = $user->userRole();
|
||||||
|
$list = [];
|
||||||
$query = Store::filter($request->all());
|
$query = Store::filter($request->all());
|
||||||
if ($role == UserRole::User || $role == UserRole::Store) {
|
if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
|
||||||
$query->whereIn('id', [$user->store_id]);
|
$list = [Store::findOrFail($user->store_id)];
|
||||||
|
} else if (in_array(UserRole::Admin, $role)) {
|
||||||
|
$list = Store::get();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->get();
|
return StoreResource::collection($list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@ class CheckUserRole
|
||||||
{
|
{
|
||||||
$user = auth('api')->user();
|
$user = auth('api')->user();
|
||||||
$currentRole = $user->userRole();
|
$currentRole = $user->userRole();
|
||||||
// dd($currentRole, $roles);
|
|
||||||
foreach ($currentRole as $role) {
|
foreach ($currentRole as $role) {
|
||||||
$roleValue = $role->value;
|
$roleValue = $role->value;
|
||||||
if (!in_array($roleValue, $roles)) {
|
if (!in_array($roleValue, $roles)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue