代码合并

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java

@@ -305,7 +305,7 @@ public class GeneralDeviceService {
         //获取包括当前部门的后代所有部门信息
         List<DeptDTO> deptInfos = deptFeignClient.getDeptDescendantIndexes(deviceInfoParam.getDeptIndex(), deptType).getData();
         List<DeptDTO> directDeptInfos = deptInfos.stream()
-                .filter(deptDTO -> deptDTO.getPid().equals(deviceInfoParam.getDeptIndex()))
+                .filter(deptDTO -> deptDTO.getPid().equals(deviceInfoParam.getDeptIndex())).sorted(Comparator.comparing(DeptDTO::getSort))
                 .collect(Collectors.toList());
         if (CollectionUtil.isEmpty(directDeptInfos)) {
             //没有直接子部门，获取当前部门所有信息
@@ -631,13 +631,13 @@ public class GeneralDeviceService {
 
         return exceptionDeviceInfoVOS;
     }
-    /** 
-    * @Description: getDeptDeviceDetail 
-    * @Param: [deviceInfoParam] 
-    * @return: com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO 
+    /**
+    * @Description: getDeptDeviceDetail
+    * @Param: [deviceInfoParam]
+    * @return: com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO
     * @Author: clam
-    * @Date: 2022/11/4 
-    */ 
+    * @Date: 2022/11/4
+    */
     public DeptDeviceDetailVO getDeptDeviceDetail(DeviceInfoParam deviceInfoParam) {