diff --git a/app/Http/Controllers/V3/RahdaranController.php b/app/Http/Controllers/V3/RahdaranController.php
index 5f7b7227..02e8bfea 100644
--- a/app/Http/Controllers/V3/RahdaranController.php
+++ b/app/Http/Controllers/V3/RahdaranController.php
@@ -14,16 +14,21 @@ class RahdaranController extends Controller
 
     public function list(): JsonResponse
     {
-        $rahdaranList = Rahdaran::query()->get();
-
-        return $this->successResponse($rahdaranList);
+        return $this->successResponse(Rahdaran::all());
     }
 
     public function search(Request $request): JsonResponse
     {
-        $matchedSearchedRahdaran = Rahdaran::query()
-            ->where('code', 'LIKE', "%{$request->code}%")
-            ->get();
+        if ($request->has('code')) {
+            $matchedSearchedRahdaran = Rahdaran::query()
+                ->where('code', 'LIKE', "%{$request->code}%")
+                ->get();
+        }
+        else {
+            $matchedSearchedRahdaran = Rahdaran::query()
+                ->where('name', 'LIKE', "%{$request->name}%")
+                ->get();
+        }
 
         return $this->successResponse($matchedSearchedRahdaran);
     }