Merge remote-tracking branch 'origin/feature-201836-wangcz' into feature-201836-wangcz

src/main/java/com/uas/platform/b2c/core/support/view/JxlsExcelView.java

@@ -36,7 +36,7 @@ public class JxlsExcelView extends AbstractExcelView {
     /**
      * 管理后台goods最大导出行
      */
-	public final static int GOODS_MAX_SIZE = 5000;
+	public final static int GOODS_MAX_SIZE = 1000;
 
     /**
      * 文件名

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -856,7 +856,7 @@ public class GoodsController {
         if (!modelAndView.isEmpty()) {
             return modelAndView;
         }
-        PageInfo info = new PageInfo(params);
+        PageInfo info = new PageInfo(1, JxlsExcelView.GOODS_MAX_SIZE);
         List<Goods> goodsList = goodsService.multiSearch(info, goodsFilter);
         if (CollectionUtils.isNotEmpty(goodsList)) {
             logger.info("产品导出结果 products: " + goodsList.size());

src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -527,7 +527,7 @@ public class ProductController {
         if (!modelAndView.isEmpty()) {
             return modelAndView;
         }
-        PageInfo info = new PageInfo(params);
+        PageInfo info = new PageInfo(1, JxlsExcelView.GOODS_MAX_SIZE);
         Page<V_ProductPrivate> page = productService.getPageDataOfBackground(info, goodsFilter);
         if (CollectionUtils.isNotEmpty(page.getContent())) {
             logger.info("产品导出结果 products: " + page.getContent().size());