fix(装备模块): 修改查询库房的接口，当只是某一个库房的时候，不分页，查询其他库房的时候需要分页

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -1380,8 +1380,10 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         log.info("查询和拼接时间:{}",stopWatch1.getTotalTimeMillis()+"ms");
         Page<AllVO> allVOPage = PageUtil.getPerPage(queryTheWarehouseVo.getPage(),
                 queryTheWarehouseVo.getSize(), pageAllVo, queryTheWarehouseVo.getPageable());
-        //不分页的数据
-        map.put("pageAllVo",pageAllVo);
+        //不分页的数据 如果是单个库房 则不需要分页
+        if(queryTheWarehouseVo.getStorageLocationId() != null){
+            map.put("pageAllVo",pageAllVo);
+        }
         List<DeviceLibrary> collect = pageAllVo.stream().map(AllVO::getDeviceLibrary).collect(Collectors.toList());
         List<String> models =
                 collect.stream().map(DeviceLibrary::getModel).distinct().collect(Collectors.toList());
@@ -1445,7 +1447,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         List<DeviceLibraryPosition> deviceLibraryPositions = new ArrayList<>();
         List<Integer> status = new ArrayList<>(Arrays.asList(5,10,11,12));
         deviceLibraryList.forEach(deviceLibrary -> {
-            if (deviceLibrary.getIsPart()==0 || !status.contains(deviceLibrary.getLifeStatus())) {
+            if (deviceLibrary.getIsPart()==0 && !status.contains(deviceLibrary.getLifeStatus())) {
                 DeviceLibraryPosition deviceLibraryPosition = new DeviceLibraryPosition();
                 deviceLibraryPosition.setDeviceId(deviceLibrary.getId());
                 deviceLibraryPositions.add(deviceLibraryPosition);