提交修改 东西

core/CoreApp/controllers/Returns.php

@@ -141,6 +141,7 @@ class Returns extends Start_Controller {
 			$whcd_status = $this->input->post('whcd_status',true);
 			$timetk = strtotime($timetk);
 			$timetj = strtotime($timetj);
+			$fgshop = $fgshop.' shop = "0" or';
 			$where = "(".rtrim($fgshop,'or').")";
 			if($number)
             {
@@ -199,7 +200,9 @@ class Returns extends Start_Controller {
                 $where  .= " and ".$xztime." > '$timetk' and ".$xztime." < '$timetj'";
             }
 			//数据排序
-            $order_str = " is_jiaji desc,jiaji_status asc, ".$xztime." desc";
+            //$order_str = " is_jiaji desc,jiaji_status asc,shop = 0 desc, ".$xztime." desc";
+			$order_str = " is_jiaji desc,jiaji_status asc,IF(shop=0,1,0) desc, ".$xztime." desc";
+
             if(empty($page))
 		    {
                 $start = 0;
@@ -209,7 +212,7 @@ class Returns extends Start_Controller {
 		    {
                 $start = ($page - 1)*$perpage;
             }
-			$info_list = $this->returns->find_all($where,'id,region,number,name,express,torderinfo,shop,,time,edittime,qr,is_jiaji,jiaji_status,extra_cont',$order_str,$start,$perpage);
+			$info_list = $this->returns->find_all($where,'id,region,shop,number,name,express,torderinfo,time,edittime,qr,is_jiaji,jiaji_status,extra_cont',$order_str,$start,$perpage);
 			foreach ($info_list as $key=>$value) 
 		    {
 				$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);