fix:增加active过滤

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakDepartmentController.java

@@ -108,6 +108,7 @@ public class KeycloakDepartmentController {
     @SysLogIgnore
     @GetMapping("/admin/department/device/list")
     public Response listDepartmentDevice(DeviceDepartmentCmd departmentCmd){
+        if(departmentCmd.getActivate() == null){departmentCmd.setActivate(true);}
         return SingleResponse.of(departmentService.listDepartmentDevice(departmentCmd));
     }
 }

smsb-customer-manager-app/src/main/java/com/inspur/customer/service/org/SmsbDepartmentServiceImpl.java

@@ -339,26 +339,26 @@ public class SmsbDepartmentServiceImpl extends ServiceImpl<SmsbDepartmentMapper
             BeanUtils.copyProperties(department , deviceDepartmentDto);
             if(StringUtils.isEmpty(departmentCmd.getOrg()) && department.getId() == null){
                 // 根节点为租户，该租户下未被分配的设备
-                deviceDepartmentDto.setDevices(deviceService.ListDeviceUnbound(departmentCmd.getTenant()));
+                deviceDepartmentDto.setDevices(deviceService.ListDeviceUnbound(departmentCmd.getTenant() , departmentCmd.getActivate()));
             }else {
                 // 根节点为部门
-                deviceDepartmentDto.setDevices(deviceService.ListDeviceBind(department.getPath()));
+                deviceDepartmentDto.setDevices(deviceService.ListDeviceBind(department.getPath() , departmentCmd.getActivate()));
             }
             // todo 递归子项
-            deviceDepartmentDto.setChildren(chaildRecurrenceHandle(department.getChildren()));
+            deviceDepartmentDto.setChildren(chaildRecurrenceHandle(department.getChildren() , departmentCmd.getActivate()));
         }
         // 3. 组装设备信息并返回
         return deviceDepartmentDto;
     }
 
-    private List<DeviceDepartmentDto> chaildRecurrenceHandle(List<SmsbDepartmentCO> children){
+    private List<DeviceDepartmentDto> chaildRecurrenceHandle(List<SmsbDepartmentCO> children , Boolean activate){
         List<DeviceDepartmentDto> childrenList = Lists.newArrayList();
         if(!CollectionUtils.isEmpty(children)){
             children.forEach(child->{
                 DeviceDepartmentDto deviceDepartmentDto = new DeviceDepartmentDto();
                 BeanUtils.copyProperties(child , deviceDepartmentDto);
-                deviceDepartmentDto.setDevices(deviceService.ListDeviceBind(child.getPath()));
-                deviceDepartmentDto.setDevices(chaildRecurrenceHandle(child.getChildren()));
+                deviceDepartmentDto.setDevices(deviceService.ListDeviceBind(child.getPath() , activate));
+                deviceDepartmentDto.setDevices(chaildRecurrenceHandle(child.getChildren() , activate));
                 childrenList.add(deviceDepartmentDto);
             });
         }