diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
index 24add30..645a698 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
@@ -564,7 +564,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
             for (Map<String, Object> clusterDevice : clusterIds) {
                 BMSBatteryClusterVo bmsBatteryClusterVo = new BMSBatteryClusterVo();
                 bmsBatteryClusterVo.setDeviceName(clusterDevice.get("deviceName").toString());
-                bmsBatteryClusterVo.setParentDeviceName(clusterDevice.get("parentDeviceName").toString());
+                bmsBatteryClusterVo.setParentDeviceName(clusterDevice.get("parentDeviceName") == null ? null : clusterDevice.get("parentDeviceName").toString());
                 // 从redis取单个簇详细数据
                 String clusterId = clusterDevice.get("id").toString();
                 EmsBatteryCluster clusterData = redisCache.getCacheObject(RedisKeyConstants.CLUSTER +siteId+"_"+clusterId);