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<string>() { Id = input.IoTPlatformProductId });