diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index 98dc008..29941f2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -132,6 +132,8 @@ public class UdiInfoController { } ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); productInfoFilterRequest.setNameCode(filterUdiInfoRequest.getNameCode()); + productInfoFilterRequest.setPage(filterUdiInfoRequest.getPage()); + productInfoFilterRequest.setLimit(filterUdiInfoRequest.getLimit()); try { BaseResponse> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest); if (udiDlDeviceResponse.getCode() != 20000) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java index 5e3ac50..75f8cdd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/impl/ProductInfoServiceImpl.java @@ -108,7 +108,9 @@ public class ProductInfoServiceImpl implements ProductInfoService { int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); productInfoFilterRequest.setPage(offset); productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit()); - + } else { + productInfoFilterRequest.setPage(1); + productInfoFilterRequest.setLimit(10); } List data = productInfoDao.filterUdiNoPage(productInfoFilterRequest); @@ -120,13 +122,6 @@ public class ProductInfoServiceImpl implements ProductInfoService { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); BeanUtils.copyProperties(request, productInfoFilterRequest); - - if (productInfoFilterRequest.getPage() != null) { - int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); - productInfoFilterRequest.setPage(offset); - productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit()); - - } return productInfoDao.filterUdiNoPageCount(productInfoFilterRequest); }