diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
index 09928e2..700677c 100644
--- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
+++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java
@@ -123,9 +123,9 @@ public class EmsSiteMonitorController extends BaseController{
      * 获取所有电池簇
      */
     @GetMapping("/getClusterNameList")
-    public AjaxResult getClusterNameList(@RequestParam String stackDeviceId)
+    public AjaxResult getClusterNameList(@RequestParam String siteId, @RequestParam String stackDeviceId)
     {
-        return success(iEmsSiteService.getAllClusterInfo(stackDeviceId));
+        return success(iEmsSiteService.getAllClusterInfo(siteId, stackDeviceId));
     }
 
     /**
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
index 51a7a05..c2acc64 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
@@ -21,7 +21,7 @@ public interface IEmsSiteService
 
     public List<Map<String,Object>> getAllStackInfo(String siteId);
 
-    public List<Map<String,Object>> getAllClusterInfo(String stackDeviceId);
+    public List<Map<String,Object>> getAllClusterInfo(String siteId, String stackDeviceId);
 
     public List<EmsSiteSetting> getAllSiteInfoList(String siteName, String startTime, String endTime);
 
diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
index 1aee491..d88adfe 100644
--- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
+++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
@@ -52,8 +52,8 @@ public class EmsSiteServiceImpl implements IEmsSiteService
      * @return
      */
     @Override
-    public List<Map<String, Object>> getAllClusterInfo(String parentId) {
-        return emsDevicesMapper.getDeviceInfoByParentId(null,parentId);
+    public List<Map<String, Object>> getAllClusterInfo(String siteId, String parentId) {
+        return emsDevicesMapper.getDeviceInfoByParentId(siteId,parentId);
     }
 
     /**