From 391ed354f8b3b806f6d5d2db6d2a3f640329c87b Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Wed, 15 Oct 2025 17:53:12 +0800
Subject: [PATCH] =?UTF-8?q?dds-=E7=94=B5=E6=B1=A0=E7=B0=87=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E7=88=B6=E7=B1=BB?=
 =?UTF-8?q?stackId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xzzn/ems/service/impl/DDSDataProcessServiceImpl.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java
index f066353..7cf76e3 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java
@@ -513,9 +513,10 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
                     return  stackDeviceId;
                 }
             }
-            stackDeviceId = list.get(0).getParentId();
-            if (stackDeviceId == null || stackDeviceId.isEmpty()) {
-                   return  stackDeviceId;
+            for (EmsDevicesSetting emsDevicesSetting : list) {
+                if (deviceId.equals(emsDevicesSetting.getDeviceId())) {
+                    stackDeviceId = emsDevicesSetting.getParentId();
+                }
             }
         }
         return stackDeviceId;