diff --git a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
index 0ba06f1..5571a65 100644
--- a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
+++ b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
@@ -108,7 +108,7 @@ namespace FrontendWebApi.ApiControllers
 
         [HttpPost]
         [Route("api/EmergencyDevice")]
-        public async Task<ActionResult<ApiResult<List<deviceMenu>>>> EmergencyDevice([FromBody] selectdevice selectdevice)
+        public async Task<ActionResult<ApiResult<List<deviceMenu>>>> EmergencyDevice(selectdevice selectdevice)
         {
             ApiResult<List<deviceMenu>> apiResult = new ApiResult<List<deviceMenu>>();
             if (!jwtlife)
diff --git a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml
index 3696639..e67fc7e 100644
--- a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml
+++ b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml
@@ -26,9 +26,9 @@
                 <div class="panel-hdr">
                     <div class="col-auto">防災類別</div>
                     <div class="col" id="disaster">防災類別</div>
-                    <div class="col-auto">
+                   @* <div class="col-auto">
                         <button type="button" class="btn btn-secondary" onclick="OnSimulationExercise('', '',1)">模擬演練</button>
-                    </div>
+                    </div>*@
                 </div>
                 <div class="panel-hdr">
                     <div class="col-auto">棟別</div>
@@ -629,7 +629,7 @@
                     "type": "POST",
                     "data": function (d) {
                         d.select_disasters = SelectedFilter.disasters;
-                        d.selectbuilding = SelectedFilter.building_tag;
+                        d.selectbuilding = SelectedFilter.building_tag != "" ? [SelectedFilter.building_tag] : [];
                         d.select_Floors = SelectedFilter.floor_guids;
                         d.select_Layer3 = SelectedFilter.layer3;
                     },