修改出库速卖通不管是不是合并订单都不影响 并且去翔文的检索

core/CoreApp/controllers/Systemfout.php

@@ -357,7 +357,7 @@ class Systemfout extends Start_Controller {
             }
             
             
-			$info_listxw = $this->fullorderxw->find_all($where,'id,shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks',$order_str,$start,$perpage);
+			$info_listxw = [];
 			 //格式化数据
             foreach ($info_listxw as $key=>$value) 
 		    {
@@ -404,7 +404,8 @@ class Systemfout extends Start_Controller {
 					$info_listxw[$key]['librarytime'] = '<em class="t">'.date('Y-m-d H:i:s',$value['librarytime']).'</em>';
 				}
             }
-			$info_listsmt = $this->fullordersmt->find_all($where." and mergeid = '0'",'id,shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks',$order_str,$start,$perpage);
+			$info_listsmt = $this->fullordersmt->find_all($where,'id,shop,type,orderinfo,number,waybill,express,print,library,librarytime,shipremarks',$order_str,$start,$perpage);
+
 			 //格式化数据
             foreach ($info_listsmt as $key=>$value) 
 		    {