diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java
index cc1c74c..c6a7ca3 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsEventUserPOMapper.java
@@ -21,7 +21,7 @@ import java.util.List;
 public interface CsEventUserPOMapper extends BaseMapper<CsEventUserPO> {
     Integer queryEventCount(@Param("csEventUserQueryParam") CsEventUserQueryParam csEventUserQueryParam);
 
-    List<EventDetailVO> queryUserEventList(@Param("csEventUserQueryParam") CsEventUserQueryParam csEventUserQueryParam);
+    List<EventDetailVO> queryUserEventList(@Param("csEventUserQueryParam") CsEventUserQueryParam csEventUserQueryParam, @Param("devIds") List<String> devIds);
 
     Page<EventDetailVO> queryEventpage(Page<EventDetailVO> returnpage, @Param("csEventUserQueryPage") CsEventUserQueryPage csEventUserQueryPage, @Param("devIds") List<String> devIds);
 }
\ No newline at end of file
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index 3bc1310..9b30314 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -46,6 +46,10 @@
       #{item}
     </foreach>
     </if>
+    and b.device_id in
+    <foreach collection="devIds" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
 
     <if test="csEventUserQueryParam!=null and csEventUserQueryParam.type != null and csEventUserQueryParam.type !=''">
       AND   b.type =#{ csEventUserQueryParam.type}
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index 42fc8d6..e2fcad0 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -88,7 +88,20 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
 //            List<String> collect = data.stream().map(DictData::getCode).collect(Collectors.toList());
 //            csEventUserQueryParam.setTarget(collect);
 //        }
-        List<EventDetailVO>  list = this.getBaseMapper().queryUserEventList(csEventUserQueryParam);
+
+        List<String> deviceId = new ArrayList<>();
+        List<CsLedgerVO> data = csLedgerFeignClient.getDeviceTree().getData();
+
+        List<String> collect = data.stream().map(CsLedgerVO::getChildren).
+                flatMap(Collection::stream).
+                map(CsLedgerVO::getChildren).
+                flatMap(Collection::stream).
+                map(CsLedgerVO::getId).
+                collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(collect)){
+            return  new ArrayList<>();
+        }
+        List<EventDetailVO>  list = this.getBaseMapper().queryUserEventList(csEventUserQueryParam,collect);
            // 主要用于统计不关心详情，详情重分页查询获取
 //        list.forEach(temp->{
 //            DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();