From 65962d73efa39cc9942ab82dada29da75de585d9 Mon Sep 17 00:00:00 2001 From: dev02 Date: Mon, 26 Jun 2023 16:58:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9sub=20?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/DeviceManageController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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(); @@ -195,7 +195,7 @@ namespace FrontendWebApi.ApiControllers history_Main_System.full_name = main.main_name; history_Main_System.History_Sub_systems = new List(); - 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();