From c8c8d1c45f571236a9cf360cc8c8a4f3bbf00ea9 Mon Sep 17 00:00:00 2001
From: ChenYi <296215406@outlook.com>
Date: Mon, 26 Jan 2026 15:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=BE=E5=A4=87=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=AE=B0=E5=BD=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeviceAggregation/DeviceAggregationService.cs               | 1 +
 .../Subscribers/ServiceCommunicationChannelSubscriberService.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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