diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java index ae4342a7e..5bdd631e7 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java @@ -322,12 +322,11 @@ public class GeneralDeviceService { .collect(Collectors.toList()); if (CollectionUtil.isEmpty(directDeptInfos)) { // 没有直接子部门(树的最底层),获取当前部门所有信息 -// List dept = deptInfos.stream() -// .filter(deptDTO -> deptDTO.getId().equals(deviceInfoParam.getDeptIndex())) -// .collect(Collectors.toList()); + List dept = deptInfos.stream() + .filter(deptDTO -> deptDTO.getId().equals(deviceInfoParam.getDeptIndex())) + .collect(Collectors.toList()); deviceInfos.add(getGeneralDeviceInfo( - // dept.get(0), - deptInfos.get(0), + dept.get(0), deviceType, Collections.singletonList(deviceInfoParam.getDeptIndex()), deviceInfoParam));