diff --git a/FrontendWebApi/ApiControllers/BuildController.cs b/FrontendWebApi/ApiControllers/BuildController.cs
index 135a379..ff5117e 100644
--- a/FrontendWebApi/ApiControllers/BuildController.cs
+++ b/FrontendWebApi/ApiControllers/BuildController.cs
@@ -604,7 +604,7 @@ namespace FrontendWebApi.ApiControllers
                 }
 
                 //抓出該設備所需要的顯示的即時資料(平面圖)
-                var sql_tips = $@"SELECT di.* FROM device_item di WHERE di.deleted = 0 AND is_show = 1 AND device_name_tag = @sub_system_tag";
+                var sql_tips = $@"SELECT di.* FROM device_item di WHERE di.deleted = 0 AND is_show = 1 AND device_name_tag = @sub_system_tag and device_building_tag = '{post.building_tag}'";
 
                 var device_item_floormap = await backendRepository.GetAllAsync<DeviceItem>(sql_tips, new { sub_system_tag = post.sub_system_tag });
 
diff --git a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
index 5571a65..0b92271 100644
--- a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
+++ b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
@@ -500,11 +500,11 @@ namespace FrontendWebApi.ApiControllers
                     from (
 	                    SELECT *
 	                    FROM device_group dg WHERE dg.device_disaster != 0) dg
-	                    left join (select * from variable v where v.system_type = 'disaster' and v.deleted = 0) vd on vd.system_value = dg.device_disaster
-	                    left join building b on b.building_tag = dg.device_building_tag
-	                    left join floor f on f.floor_guid = dg.device_floor_guid
-	                    left join (select * from variable v where v.system_type = 'device_system_category_layer2' and v.deleted = 0) v2 on v2.system_value = dg.device_system_category_layer2
-	                    left join (select * from variable v where v.system_type = 'device_system_category_layer3' and v.deleted = 0) v3 on v3.system_value = dg.device_system_category_layer3
+	                    join (select * from variable v where v.system_type = 'disaster' and v.deleted = 0) vd on vd.system_value = dg.device_disaster
+	                    join building b on b.building_tag = dg.device_building_tag
+	                    join floor f on f.floor_guid = dg.device_floor_guid
+	                    join (select * from variable v where v.system_type = 'device_system_category_layer2' and v.deleted = 0) v2 on v2.system_value = dg.device_system_category_layer2
+	                    join (select * from variable v where v.system_type = 'device_system_category_layer3' and v.deleted = 0) v3 on v3.system_value = dg.device_system_category_layer3
                       order by vd.system_priority,b.priority,f.priority,v2.system_priority,v3.system_priority");
 
                 var dis = getDeviceGroup.GroupBy(a => a.device_disaster);