2024年1月22日13:32:00

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1341,7 +1341,7 @@ public class ExportOrderController extends BladeController {
 	@GetMapping("/listBYStatus")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入order")
-	public R<List<Order>> listBYStatus(Order order) {
+	public R<IPage<Order>> listBYStatus(Order order, Query query) {
 		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Order::getIsDeleted, 0)
 			.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -1354,7 +1354,7 @@ public class ExportOrderController extends BladeController {
 		if (!AuthUtil.getUserRole().contains("admin")) {
 			lambdaQueryWrapper.eq(Order::getBuyerId, AuthUtil.getUserId());
 		}
-		List<Order> orderList = orderService.list(lambdaQueryWrapper);
+		IPage<Order> orderList = orderService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(orderList);
 	}