Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

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 = [];

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 = [];