diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json
index d9b4695..fa903a2 100644
--- a/Backend/appsettings.Development.json
+++ b/Backend/appsettings.Development.json
@@ -20,6 +20,7 @@
       //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
       //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
+      //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }
diff --git a/Backend/appsettings.json b/Backend/appsettings.json
index c0ce7a5..4a53716 100644
--- a/Backend/appsettings.json
+++ b/Backend/appsettings.json
@@ -19,6 +19,7 @@
       //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //三菱
       //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
+      //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }
diff --git a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
index e2e78b4..4dba11c 100644
--- a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
+++ b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
@@ -70,7 +70,7 @@ namespace FrontendWebApi.ApiControllers
             List<BuildingToF> buildingToF = new List<BuildingToF>();
             try
             {
-                var sqlString = @$"select f.floor_guid ,f.full_name floorname,b.building_guid,b.full_name buildingname from floor f left join building b on b.building_guid = f.building_guid order by f.building_guid , f.priority";
+                var sqlString = @$"select f.floor_guid ,f.full_name floorname,b.building_tag,b.full_name buildingname from floor f left join building b on b.building_tag = f.building_tag order by f.building_tag , f.priority";
                 Building_floor = await backendRepository.GetAllAsync<building_floor>(sqlString);
 
                 var builds = Building_floor.GroupBy(a => a.building_guid).ToList();
@@ -491,7 +491,7 @@ namespace FrontendWebApi.ApiControllers
 	                    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_guid
+	                    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
diff --git a/FrontendWebApi/appsettings.Development.json b/FrontendWebApi/appsettings.Development.json
index 8253f21..b530df5 100644
--- a/FrontendWebApi/appsettings.Development.json
+++ b/FrontendWebApi/appsettings.Development.json
@@ -20,6 +20,7 @@
       //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
       //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
+      //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }
diff --git a/FrontendWebApi/appsettings.json b/FrontendWebApi/appsettings.json
index eef838c..1052fc0 100644
--- a/FrontendWebApi/appsettings.json
+++ b/FrontendWebApi/appsettings.json
@@ -26,6 +26,7 @@
       //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
       "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
       //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
+      //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     },