diff --git a/app/Http/Controllers/Api/Auth/UserController.php b/app/Http/Controllers/Api/Auth/UserController.php
index 97eecfd..b06a462 100644
--- a/app/Http/Controllers/Api/Auth/UserController.php
+++ b/app/Http/Controllers/Api/Auth/UserController.php
@@ -60,11 +60,14 @@ class UserController extends Controller
     {
         $user = $this->guard()->user();
         $role = $user->userRole();
+        $list = [];
         $query = Store::filter($request->all());
-        if ($role == UserRole::User || $role == UserRole::Store) {
-            $query->whereIn('id', [$user->store_id]);
+        if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) {
+            $list = [Store::findOrFail($user->store_id)];
+        } else if (in_array(UserRole::Admin, $role)) {
+            $list = Store::get();
         }
 
-        return $query->get();
+        return StoreResource::collection($list);
     }
 }
diff --git a/app/Http/Middleware/CheckUserRole.php b/app/Http/Middleware/CheckUserRole.php
index 8caaca9..7f94574 100644
--- a/app/Http/Middleware/CheckUserRole.php
+++ b/app/Http/Middleware/CheckUserRole.php
@@ -18,7 +18,6 @@ class CheckUserRole
     {
         $user = auth('api')->user();
         $currentRole = $user->userRole();
-        // dd($currentRole, $roles);
         foreach ($currentRole as $role) {
             $roleValue = $role->value;
             if (!in_array($roleValue, $roles)) {