From 0afe05606ec070bf73d534bf4926717bd4662721 Mon Sep 17 00:00:00 2001
From: Yuka Higashide <higashide@s-force.co.jp>
Date: Tue, 7 Oct 2025 15:27:12 +0900
Subject: [PATCH] =?UTF-8?q?=E9=A7=90=E8=BC=AA=E5=A0=B4=E6=A4=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=20=E4=B8=A6=E3=81=B3=E6=9B=BF=E3=81=88?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/RegularContractCreateController.php  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/Http/Controllers/RegularContractCreateController.php b/app/Http/Controllers/RegularContractCreateController.php
index 26371b9..95b71bf 100644
--- a/app/Http/Controllers/RegularContractCreateController.php
+++ b/app/Http/Controllers/RegularContractCreateController.php
@@ -97,6 +97,18 @@ class RegularContractCreateController extends Controller
         $total = $query->count();
         $parks_table = $query->skip(($page - 1) * $perPage)->take($perPage)->get();
 
+        if ($sort === 'park_ruby' || $sort === 'station_name_ruby') {
+            setlocale(LC_COLLATE, 'ja_JP.UTF-8');
+            $parks_table = $parks_table->sort(function ($a, $b) use ($order, $sort) {
+                // null対策
+                $a_val = $a->$sort ?? '';
+                $b_val = $b->$sort ?? '';
+                return $order === 'asc'
+                    ? strcoll($a_val, $b_val)
+                    : strcoll($b_val, $a_val);
+            })->values();
+        }
+
         // zoneテーブルデータを取得（psectionテーブルとJOINしてpsection_subjectも取得）
         $zones = DB::table('zone')
             ->leftJoin('psection', 'zone.psection_id', '=', 'psection.psection_id')