diff --git a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
index efd06ff..673fd7b 100644
--- a/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
+++ b/src/JiShe.IoT.Application/DeviceAggregation/DeviceAggregationService.cs
@@ -1169,6 +1169,7 @@ namespace JiShe.IoT.DeviceAggregation
 
                 var upgradeRecordInput = new CreateDeviceUpgradeRecordInput()
                 {
+                    DeviceDataId = deviceInfo.Id,
                     DeviceName = deviceInfo.DeviceName,
                     DeviceAddress = deviceInfo.DeviceAddress,
                     OldFirmwareVersion = deviceInfo.FirmwareVersion,
diff --git a/src/JiShe.IoT.Application/Subscribers/ServiceCommunicationChannelSubscriberService.cs b/src/JiShe.IoT.Application/Subscribers/ServiceCommunicationChannelSubscriberService.cs
index 74c8f63..3036151 100644
--- a/src/JiShe.IoT.Application/Subscribers/ServiceCommunicationChannelSubscriberService.cs
+++ b/src/JiShe.IoT.Application/Subscribers/ServiceCommunicationChannelSubscriberService.cs
@@ -195,7 +195,7 @@ namespace JiShe.ServicePro.OneNETManagement.Subscribers
                         .Set(d => d.UpgradeDate, currentTime)
                         .Set(d => d.LastModificationTime, currentTime)
                         .Set(d => d.LastModifierId, CurrentUser.Id)
-                        .Where(d=>d.DeviceAddress == deviceUpgradeRecordEntity.DeviceAddress)
+                        .Where(d=>d.Id == deviceUpgradeRecordEntity.DeviceDataId)
                         .ExecuteAffrowsAsync();
                 }
                 else