测试

core/CoreApp/controllers/Systemprinttest.php

@@ -515,12 +515,22 @@ class Systemprinttest extends Start_Controller {
 
 			$pagenum = ceil($total/$perpage);
 		    $over = $total-($start+$perpage);
+			if($print == 3){
+				// $rows_jj = $this->indexSort($info_list_jj,$info_listamz_jj,$info_listtt_jj,$info_listxw_jj,$info_listsmt_jj,$print);
 
-			$rows_jj = $this->indexSort($info_list_jj,$info_listamz_jj,$info_listtt_jj,$info_listxw_jj,$info_listsmt_jj,$print);
+				// $rows_no = $this->indexSort($info_list,$info_listamz,$info_listtt,$info_listxw,$info_listsmt,$print);
+				$tmp_all_rows =  array_merge($info_list_jj,$info_listamz_jj,$info_listtt_jj,$info_listxw_jj,$info_listsmt_jj,$info_list,$info_listamz,$info_listtt,$info_listxw,$info_listsmt);
 
-			$rows_no = $this->indexSort($info_list,$info_listamz,$info_listtt,$info_listxw,$info_listsmt,$print);
-
-			$rows = array_merge($rows_jj,$rows_no);
+				$rows = $this->indexSort($tmp_all_rows,$print);
+			}else{
+				$tmp_jj_row =  array_merge($info_list_jj,$info_listamz_jj,$info_listtt_jj,$info_listxw_jj,$info_listsmt_jj);
+				$rows_jj = $this->indexSort($tmp_jj_row,$print);
+				$tmp_no_row = array_merge($info_list,$info_listamz,$info_listtt,$info_listxw,$info_listsmt);
+				$rows_no = $this->indexSort($tmp_no_row,$print);
+	
+				$rows = array_merge($rows_jj,$rows_no);
+			}
+			
 			
 
 			$rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($rows),'cs'=>$where);//array_merge($info_list,$info_list_smt,$info_listsmt)
@@ -609,8 +619,7 @@ class Systemprinttest extends Start_Controller {
 		];
 	}
 	//订单表排序
-	protected function indexSort($info_list,$info_listamz,$info_listtt,$info_listxw,$info_listsmt,$print){
-		$rows = array_merge($info_list,$info_listamz,$info_listtt,$info_listxw,$info_listsmt);
+	protected function indexSort($rows,$print){
 		foreach($rows as $k=>$v){
 			$rows[$k]['index'] = $v['shipremarks'].$v['id'];
 		}