From 4d642560978d512b3d67a0f761212f25637830a3 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 28 Nov 2024 13:13:49 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/OrdersController.php | 5 ++++-
 resources/views/admin/orders/artboard.blade.php | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/OrdersController.php b/app/Http/Controllers/Admin/OrdersController.php
index d123a98..e1cb3b3 100755
--- a/app/Http/Controllers/Admin/OrdersController.php
+++ b/app/Http/Controllers/Admin/OrdersController.php
@@ -262,10 +262,13 @@ class OrdersController extends CommonController
                 }
             })->where('admin_id', $user->id)->pluck('area_id');
         }
-        $data = Area::where(function ($query) use ($areaId) {
+        $data = Area::where(function ($query) use ($areaId,$building_id) {
             if ($areaId) {
                 $query->whereIn('area.id', $areaId);
             }
+            if($building_id){
+                $query->where('building_id', $building_id);
+            }
         })->with(['project',
             "beds" => function ($query) use ($request) {
                 $query->has("onGoingOrder");
diff --git a/resources/views/admin/orders/artboard.blade.php b/resources/views/admin/orders/artboard.blade.php
index b18ac57..6427e8f 100644
--- a/resources/views/admin/orders/artboard.blade.php
+++ b/resources/views/admin/orders/artboard.blade.php
@@ -19,8 +19,7 @@
                             <select class="form-control mr-1" name="building_id"
                                     onchange="$(this).closest('form').submit()">
                                 @foreach($buildings as $pp)
-                                    <option
-                                        value="" @if('' == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
+                                    <option value="">请选择</option>
                                     <option
                                         value="{{$pp->id}}" @if($pp->id == $building_id) {{ "selected" }}@endif>{{$pp->name}}</option>
                                 @endforeach