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

Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/mjm-group/ibms

Browse Source
This commit is contained in:
張家睿 2024-03-12 13:41:15 +08:00
commit 11996a3266
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Backend/Controllers/DeviceManageController.cs
View File

@ -211,7 +211,15 @@ namespace Backend.Controllers
JOIN variable mv ON d.device_system_tag = mv.system_value AND mv.system_type = @main_system_type and mv.deleted = 0 JOIN variable mv ON d.device_system_tag = mv.system_value AND mv.system_type = @main_system_type and mv.deleted = 0
JOIN variable sv ON d.device_name_tag = sv.system_value AND sv.system_type = @sub_system_type and sv.deleted = 0 JOIN variable sv ON d.device_name_tag = sv.system_value AND sv.system_type = @sub_system_type and sv.deleted = 0
JOIN floor f ON d.device_floor_tag = f.full_name AND d.device_building_tag = f.building_tag and f.deleted = 0 JOIN floor f ON d.device_floor_tag = f.full_name AND d.device_building_tag = f.building_tag and f.deleted = 0
LEFT JOIN device_kind dk ON dk.device_building_tag = d.device_building_tag AND dk.device_system_tag = d.device_system_tag AND dk.device_name_tag = d.device_name_tag and dk.is_link = 1 LEFT JOIN device_kind dk ON
dk.device_building_tag = d.device_building_tag
AND dk.device_system_tag = d.device_system_tag
AND dk.device_name_tag = d.device_name_tag
and dk.is_link = 1
and (
(dk.device_name_tag <> 'c' and dk.device_system_tag <> 's') or
(dk.device_name_tag = 'c' and dk.device_system_tag = 's' and dk.device_model_tag = d.device_model_tag)
)
ORDER BY d.priority ASC, d.device_number ASC"; ORDER BY d.priority ASC, d.device_number ASC";
var devices = await backendRepository.GetAllAsync<Device>(sql, new var devices = await backendRepository.GetAllAsync<Device>(sql, new