From 087a935c45b34b40461397fac1f8c5cbb3b67ff7 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Tue, 24 Dec 2019 14:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8D=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/BehaviorLogController.class.php | 4 ++-- Application/Admin/Controller/ExportController.class.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 0f78755d1..5306bc473 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -122,9 +122,9 @@ class BehaviorLogController extends ThinkController if(!empty(I('get.order_number'))) { $map['tab_spend.order_number'] = I('get.order_number'); - $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)->select(); + $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(); } else { - $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->select(); + $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select(); } $show_data = []; diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 7c37adf2d..2a87bac71 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2134,9 +2134,9 @@ class ExportController extends Controller if(!empty(I('get.order_number'))) { $map['tab_spend.order_number'] = I('get.order_number'); - $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)->select(); + $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(); } else { - $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->select(); + $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select(); } $xlsData = [];