Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/ESOrderBaseController.java

@@ -80,8 +80,8 @@ public class ESOrderBaseController {
         //1.组装查询条件
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
         //2.查询要导出的内容
-        zfireParamBean.setPageNum(0);
-        zfireParamBean.setPageSize(30000);
+        zfireParamBean.setPageNum(1);
+        zfireParamBean.setPageSize(10000);
         IPage<OrderBaseVO> orderBaseVOIPage = orderBaseEsLogic.orderBaseEsList(zfireParamBean);
         //3.导出
         FieldUtils.exportData(orderBaseVOIPage.getRecords(), zfireParam.getExportFields(), request, response);

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -73,6 +73,7 @@ public class OrderBaseController {
     public void listExport(@RequestBody WorkOrderZfireParam zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
         //1.组装查询条件
         ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
+        zfireParam.setPageSize(10000);
         //2.查询要导出的内容
         IPage<OrderBaseVO> page = orderBaseLogic.orderBaseList(zfireParamBean);
         //3.导出