From 4172cfce13354c5b5aa2143ada83f4b3ac2ff0f1 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Tue, 6 Jan 2026 17:30:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=AD=98?= =?UTF-8?q?=E5=82=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=B1=95=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=BF=98=E9=9C=80=E6=89=BE=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IoTPlatformAggregationService.cs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs b/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs index bda24d8..1c8ab35 100644 --- a/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs +++ b/src/JiShe.IoT.Application/IoTPlatformAggregation/IoTPlatformAggregationService.cs @@ -219,9 +219,20 @@ namespace JiShe.IoT.IoTPlatformAggregation { if (!string.IsNullOrWhiteSpace(input.FiledType) && input.FiledType.ToLowerInvariant().Contains("event")) { - return OneNETAllThingModel.GetAllEventsSelectResult(oneNETAllThingModel.Events); + var tempEventResult = OneNETAllThingModel.GetAllEventsSelectResult(oneNETAllThingModel.Events); + if (tempEventResult != null) + { + selectResults.AddRange(tempEventResult); + } } - return OneNETAllThingModel.GetAllPropertiesSelectResult(oneNETAllThingModel.Properties); + + var tempPropertyCacheResult = OneNETAllThingModel.GetAllPropertiesSelectResult(oneNETAllThingModel.Properties); + if (tempPropertyCacheResult != null) + { + selectResults.AddRange(tempPropertyCacheResult); + } + + return selectResults; } var oneNetProductInfos = await _oneNetProductService.GetProductInfoAsync(new IdInput() { Id = input.IoTPlatformProductId });