From 4f88cd025ea38b5fa5ce6ea0c1e6274616bb8672 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Sun, 26 Apr 2020 17:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=B8=81=E5=AF=BC=E5=87=BA=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 48f9e40a7..f742f1192 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2253,9 +2253,9 @@ class ExportController extends Controller if(!empty(I('get.extend'))) { $map['tab_spend.extend'] = I('get.extend'); - $data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->page($p, $row)->order('tab_repair_pay.id DESC')->select(); + $data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->order('tab_repair_pay.id DESC')->select(); } else { - $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select(); + $data = M('repair_pay', 'tab_')->where($map)->order('id DESC')->select(); } $xlsData = [];