From 5acecf13cbc07e95bb2faba60f2a340cb0b31781 Mon Sep 17 00:00:00 2001 From: dev02 Date: Fri, 5 May 2023 16:45:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=8C=AF=E8=AA=A4api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/BuildController.cs | 4 +++- FrontendWebApi/Models/Build.cs | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FrontendWebApi/ApiControllers/BuildController.cs b/FrontendWebApi/ApiControllers/BuildController.cs index 5bcd5ad..745b408 100644 --- a/FrontendWebApi/ApiControllers/BuildController.cs +++ b/FrontendWebApi/ApiControllers/BuildController.cs @@ -527,7 +527,8 @@ namespace FrontendWebApi.ApiControllers bm.left_icon_click_url_height, di.full_name as point_name, di.points, - di.is_bool as points_is_bool + di.is_bool as points_is_bool, + f.floor_guid from device d left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag @@ -538,6 +539,7 @@ namespace FrontendWebApi.ApiControllers left join device_item di ON d.device_name_tag = di.device_name_tag AND di.deleted = 0 AND di.is_show_riserDiagram = 1 + left join floor f on d.device_floor_tag = f.full_name and f.deleted = 0 {disasterjoinsql} LEFT JOIN building_menu bm ON d.device_building_tag = bm.building_tag AND d.device_system_tag = bm.main_system_tag AND d.device_name_tag = bm.sub_system_tag where d.deleted = 0 and d.device_building_tag = '{post.building_tag}' {sWhere} diff --git a/FrontendWebApi/Models/Build.cs b/FrontendWebApi/Models/Build.cs index 2cc3bf5..1828f21 100644 --- a/FrontendWebApi/Models/Build.cs +++ b/FrontendWebApi/Models/Build.cs @@ -136,7 +136,6 @@ namespace FrontendWebApi.Models public class DeviceFloor : Device { - public string floor_guid { get; set; } }