bug修改

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<PageSimpleResponse<ProductInfoEntity>> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest);
             if (udiDlDeviceResponse.getCode() != 20000) {

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<ProductInfoEntity> 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);
     }