diff --git a/FrontendWebApi/ApiControllers/BuildController.cs b/FrontendWebApi/ApiControllers/BuildController.cs
index 230e870..9048aff 100644
--- a/FrontendWebApi/ApiControllers/BuildController.cs
+++ b/FrontendWebApi/ApiControllers/BuildController.cs
@@ -610,7 +610,7 @@ namespace FrontendWebApi.ApiControllers
                                             {(string.IsNullOrEmpty(singleSubSql) ? $"and di.device_name_tag = '{post.sub_system_tag}'" : singleSubSql)}
                                             limit 1000
 		                            ) di on di.device_name_tag = d.device_name_tag
-                                    left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0
+                                    left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0 and d.device_building_tag = f.building_tag
                                     {disasterjoinsql}
                                     LEFT JOIN building_menu bm ON d.device_building_tag = bm.building_tag AND d.device_system_tag = bm.main_system_tag AND d.device_name_tag = bm.sub_system_tag
                                     where d.deleted = 0 and d.is_link = 1 and d.device_building_tag = '{post.building_tag}' {sWhere}