diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index b7693d9..e4614e8 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -332,8 +332,8 @@ class OrdersController extends CommonController ->select("area.id", "area.name", "area.building_id") ->leftJoin("building", "building.id", "=", "area.building_id") ->addSelect("building.name as building_name") - ->orderBy("building.myindex") ->orderBy("area.myindex") + ->orderBy("area.name") ->get(); return response()->json($areas->toArray()); } diff --git a/public/dashboard/index.html b/public/dashboard/index.html index e82da61..2bbe901 100644 --- a/public/dashboard/index.html +++ b/public/dashboard/index.html @@ -250,7 +250,7 @@ - +