diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java index c67f132..2e60f2d 100644 --- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceImpl.java @@ -53,7 +53,6 @@ public class DeviceImpl implements DeviceService { @Override public Object queryStoreroomDevice(String storeroomId, Pageable pageable) { - //PageRequest pageRequest = PageSort.pageRequest(pageable.getPageNumber(), pageable.getPageSize(), "sequence", Sort.Direction.ASC); Page page = deviceInfoRepository.findStoreroomId(storeroomId, pageable); if (getState()) { @@ -70,7 +69,7 @@ public class DeviceImpl implements DeviceService { @Override public Object queryDeviceType(String deviceTypeId, Pageable pageable) { - //PageRequest pageRequest = PageSort.pageRequest(pageable.getPageNumber(), pageable.getPageSize(), "sequence", Sort.Direction.ASC); + Page page = deviceInfoRepository.findDeviceTypeList(deviceTypeId, pageable); if (getState()) {