|
|
|
@ -332,8 +332,8 @@ class OrdersController extends CommonController
|
|
|
|
->select("area.id", "area.name", "area.building_id")
|
|
|
|
->select("area.id", "area.name", "area.building_id")
|
|
|
|
->leftJoin("building", "building.id", "=", "area.building_id")
|
|
|
|
->leftJoin("building", "building.id", "=", "area.building_id")
|
|
|
|
->addSelect("building.name as building_name")
|
|
|
|
->addSelect("building.name as building_name")
|
|
|
|
->orderBy("building.myindex")
|
|
|
|
|
|
|
|
->orderBy("area.myindex")
|
|
|
|
->orderBy("area.myindex")
|
|
|
|
|
|
|
|
->orderBy("area.name")
|
|
|
|
->get();
|
|
|
|
->get();
|
|
|
|
return response()->json($areas->toArray());
|
|
|
|
return response()->json($areas->toArray());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|