Merge branch 'dev' into pre-production

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java

@@ -57,7 +57,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 			throw new ServiceException("时间不能为空");
 		}
 		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		if (StrUtil.isEmpty(query.getWarehouseName())) {
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
@@ -128,7 +128,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 			throw new ServiceException("时间不能为空");
 		}
 		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		if (StrUtil.isEmpty(query.getWarehouseName())) {
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 			if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) {
@@ -204,7 +204,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 	public void exporTask(HttpServletResponse response, QualityDispatchTaskQuery query) {
 		IPage<QualityDispatchTaskVO> page = Condition.getPage(query);
 		page.setPages(1);
-		page.setSize(-1);
+		page.setSize(Integer.MAX_VALUE);
 		List<QualityDispatchTaskVO> list = getQualityDispatchTaskVOS(query, page);
 		ExcelUtil.export(response, list, QualityDispatchTaskVO.class);
 	}