diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs
index 1006af0..a620bc3 100644
--- a/FrontendWebApi/ApiControllers/DeviceManageController.cs
+++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs
@@ -176,7 +176,7 @@ namespace FrontendWebApi.ApiControllers
                             select distinct main_system_tag, sub_system_tag from building_menu where is_link = 1
                         ) as bm on v2.system_value = bm.sub_system_tag and v1.system_value = bm.main_system_tag
                         where c.account = @account
-                        order by  v2.system_priority", new { @account = myUser.account, @sub_system_type = sub_system_type, @main_system_type = main_system_type });
+                        order by  v2.system_priority", new { @account = "webUser", @sub_system_type = sub_system_type, @main_system_type = main_system_type });
                 var building = dbsub.GroupBy(x => x.device_building_tag).ToList();
                 apiResult.Data = new List<History_Building>();
 
@@ -195,7 +195,7 @@ namespace FrontendWebApi.ApiControllers
                         history_Main_System.full_name = main.main_name;
                         history_Main_System.History_Sub_systems = new List<History_Sub_system>();
 
-                        var subs = dbsub.Where(x => x.main_system_tag == main.main_system_tag).ToList();
+                        var subs = dbsub.Where(x => x.main_system_tag == main.main_system_tag && x.device_building_tag == history_Building.building_tag).ToList();
                         foreach (var sub in subs)
                         {
                             History_Sub_system history_Sub_System = new History_Sub_system();