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 7c2bcce..4b6a77d 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
@@ -234,14 +234,30 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
         List<String> deviceId = new ArrayList<>();
         List<CsLedgerVO> data = csLedgerFeignClient.getDeviceTree().getData();
 
+//        List<String> collect = data.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
+//                        Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid())).map(CsLedgerVO::getChildren).
+//                flatMap(Collection::stream).filter(
+//                        temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
+//                                Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
+//                ).
+//                map(CsLedgerVO::getChildren).
+//                flatMap(Collection::stream).filter(
+//                        temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
+//                                Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
+//                ).
+//                map(CsLedgerVO::getId).
+//                collect(Collectors.toList());
         List<String> collect = data.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
-                        Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid())).map(CsLedgerVO::getChildren).
-                flatMap(Collection::stream).filter(
+                        Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid()))
+                .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
                         temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
                                 Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
                 ).
-                map(CsLedgerVO::getChildren).
-                flatMap(Collection::stream).filter(
+                map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
+                        temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
+                                Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
+                ).
+                map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
                         temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
                                 Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
                 ).
@@ -251,7 +267,6 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             return returnpage;
         }
 
-
         returnpage  = this.getBaseMapper().queryEventpage(returnpage,csEventUserQueryPage,collect,flag);
 
         returnpage.getRecords().forEach(temp->{