From 318db0f5c4fb92082f0ec10049865f92d39acf0f Mon Sep 17 00:00:00 2001
From: liyinglin <liyl@langye.net>
Date: Wed, 3 Jan 2024 14:03:42 +0800
Subject: [PATCH] 1

---
 app/Http/Controllers/Admin/OrdersController.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index 13f7b84..8b04f24 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -247,14 +247,10 @@ class OrdersController extends CommonController
             ->select("area.id", "area.name", "area.building_id", "area.project_id")
             ->leftJoin("building", "area.building_id", "=", "building.id")
             ->addSelect("building.name as building_name")
-            ->withCount("beds")
-            ->get();
-        if ($has_ongoing_order) {
-            $data = $data->filter(function ($item) {
-                return $item->beds->count();
-            });
-        }
-        dd($data->count());
+            ->addSelect([
+                'beds_count' => Bed::whereColumn('area_id', 'area.id')->selectRaw('count(1)'),
+            ])->having('beds_count', '>', 0)
+            ->paginate(10);
         $projects = (new StatisticsController())->_checkProjects();
         return view($this->bladePath . ".artboard", compact("data", "projects", "project_id"));