diff --git a/Frontend/index.html b/Frontend/index.html
index 18e0b19..2c03b0f 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -2121,8 +2121,10 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
 
                 } else {
                     let strHtml = ``;
-                    $.each(res.data.history_Main_Systems, (index, subSysObj) => {
-                        strHtml += `<button id="subSysBtn${subSysObj.sub_system_tag}" data-maintag="${subSysObj.main_system_tag}"class="dropdown-item" type="button" data-page="systemMonitor" name="topFunBtn">${subSysObj.full_name}</button>`;
+                    $.each(res.data.history_Main_Systems, (index, mainSysObj) => {
+                        $.each(mainSysObj.history_Sub_systems, (index2, subSysObj) => {
+                            strHtml += `<button id="subSysBtn${subSysObj.sub_system_tag}" data-maintag="${mainSysObj.main_system_tag}"class="dropdown-item" type="button" data-page="systemMonitor" name="topFunBtn">${subSysObj.full_name}</button>`;
+                        })
                     })
                     $("#sysMonBtnList").append(strHtml);
                 }
diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs
index 23583ff..d3be9ca 100644
--- a/FrontendWebApi/ApiControllers/DeviceManageController.cs
+++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs
@@ -172,7 +172,7 @@ namespace FrontendWebApi.ApiControllers
         {
             ApiResult<List<FloorList>> apiResult = new ApiResult<List<FloorList>>();
 
-            if (string.IsNullOrEmpty(fd.main_system_tag))
+            if (string.IsNullOrEmpty(fd.sub_system_tag))
             {
                 apiResult.Code = "0001";
                 apiResult.Msg = "必須系統類別";