jay.chang/ibms-MCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[後端] 修改sub 相同問題

Browse Source
This commit is contained in:
dev02 2023-06-26 16:58:21 +08:00
parent 4956dde967
commit 65962d73ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FrontendWebApi/ApiControllers/DeviceManageController.cs
View File

@ -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();