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

合併衝突

Browse Source
This commit is contained in:
dev01 2023-09-07 16:18:44 +08:00
commit 5882577a95
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Backend/Controllers/DeviceManageController.cs
View File

@ -55,8 +55,8 @@ namespace Backend.Controllers
sv.system_priority AS sPriority
FROM building_menu bm
JOIN building b ON bm.building_tag = b.building_tag AND b.deleted = 0
JOIN variable mv ON bm.main_system_tag = mv.system_value AND mv.deleted = 0
JOIN variable sv ON bm.sub_system_tag = sv.system_value AND sv.deleted = 0";
JOIN variable mv ON bm.main_system_tag = mv.system_value AND mv.deleted = 0 and mv.system_type = '{main_system_type}'
JOIN variable sv ON bm.sub_system_tag = sv.system_value AND sv.deleted = 0 and sv.system_type = '{sub_system_type}'";
if (!string.IsNullOrEmpty(filter))
{