From 10d2254b13e3c86d09a13a277a5441d1c3660e5a Mon Sep 17 00:00:00 2001 From: dev02 Date: Mon, 19 Jun 2023 12:00:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=AD=B7=E5=8F=B2=E8=B3=87=E6=96=99=E7=8D=B2=E5=8F=96subsystem?= =?UTF-8?q?=20device?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/appsettings.Development.json | 4 ++-- FrontendWebApi/ApiControllers/HistoryController.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index 4009248..c20498b 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -21,8 +21,8 @@ //"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome //"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel //"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office - //"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut - "Database": "2U+9jYGy0dCbMzLaguBXow==", //tpe_dome_mall + "Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //mcut + //"Database": "2U+9jYGy0dCbMzLaguBXow==", //tpe_dome_mall "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" }, diff --git a/FrontendWebApi/ApiControllers/HistoryController.cs b/FrontendWebApi/ApiControllers/HistoryController.cs index 0a2f2f1..08fbd7b 100644 --- a/FrontendWebApi/ApiControllers/HistoryController.cs +++ b/FrontendWebApi/ApiControllers/HistoryController.cs @@ -212,7 +212,7 @@ namespace FrontendWebApi.ApiControllers join userinfo c on c.role_guid = a.role_guid join variable v2 on b.ShowView = v2.id and v2.system_type = @sub_system_type join variable v1 on v1.id = v2.system_parent_id and v1.system_type = @main_system_type - join device d on v1.system_value = d.device_system_tag and v2.system_value = d.device_name_tag and d.deleted = 0 and d.visible = 1 + join device d on v1.system_value = d.device_system_tag and v2.system_value = d.device_name_tag and d.deleted = 0 and d.visible = 1 and d.is_link = 1 join device_item di on d.device_system_tag=di.device_system_tag and d.device_name_tag=di.device_name_tag and di.is_link = 1 and di.is_show_history = 1 where c.account = @account