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;