diff --git a/FrontendWebApi/ApiControllers/BuildController.cs b/FrontendWebApi/ApiControllers/BuildController.cs
index af2e0d7..2b37cd9 100644
--- a/FrontendWebApi/ApiControllers/BuildController.cs
+++ b/FrontendWebApi/ApiControllers/BuildController.cs
@@ -257,7 +257,7 @@ namespace FrontendWebApi.ApiControllers
                                 string name = sub.Select(s => s.subfull_name).FirstOrDefault();
                                 bool check = true;
                                 if (name == "人流計數")
-                                    check = sub.Select(s => s.sub_system_tag).FirstOrDefault().StartsWith(menu.Select(m => m.device_building_tag).FirstOrDefault());
+                                    check = sub.Select(s => s.sub_system_tag).FirstOrDefault().StartsWith(menu.Select(m => m.device_building_tag[0]).FirstOrDefault());
 
                                 if (check) 
                                 {
@@ -580,7 +580,7 @@ namespace FrontendWebApi.ApiControllers
                                     {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.device_building_tag = '{post.building_tag}' {sWhere}
-                                    order by d.priority ASC, d.device_number ASC";
+                                    order by d.device_number ASC, d.priority ASC";
 
                 var devicelist = await backendRepository.GetAllAsync<DeviceFloor>(sql);
 
diff --git a/FrontendWebApi/appsettings.Development.json b/FrontendWebApi/appsettings.Development.json
index b87a385..f976969 100644
--- a/FrontendWebApi/appsettings.Development.json
+++ b/FrontendWebApi/appsettings.Development.json
@@ -18,10 +18,10 @@
       "Port": "js2LutKe+rdjzdxMPQUrvQ==",
       //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
       //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
-      //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
+      "Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
       //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
       //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
-      "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT
+      //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT
       "Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
       "Password": "FVAPxztxpY4gJJKQ/se4bQ=="
     }