From d4553ffa856ad367d4a98d56180d5915239b5558 Mon Sep 17 00:00:00 2001
From: zhuxinyu <1799009482@qq.com>
Date: Tue, 21 Mar 2023 10:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8id=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=AD=90=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/service/impl/GeneralDeviceService.java     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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<DeptDTO> dept = deptInfos.stream()
-//                    .filter(deptDTO -> deptDTO.getId().equals(deviceInfoParam.getDeptIndex()))
-//                    .collect(Collectors.toList());
+            List<DeptDTO> 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));