1

core/CoreApp/controllers/Whlabelfz1.php

@@ -550,15 +550,12 @@ class Whlabelfz1 extends Start_Controller
 				}
 			}
 			if (isset($_SESSION['api'])) {
-				$shop_list = [];
+				$shop_select_list = [];
 				foreach ($user as $value) {
 					if(!empty($value)){
-						$shop_list[] = $value;
+						$shop_select_list[] = $value;
 					}
 				}
-				if(count($shop_list) > 0){
-					$where_arr["shop in "] = "(" . implode(',', $shop_list) . ")";
-				}
 			}
 			if ($orderurl) {
 				$url = $this->orderurl->read($orderurl);
@@ -586,7 +583,7 @@ class Whlabelfz1 extends Start_Controller
 			$total = 0;
 			$info_list = [];
 
-			$r = $this->_getData('fullorder', $where_arr, $order_str, 'id,shop,type,orderinfo,number,waybill,express,librarytime', ($page-1)*$perpage, $perpage,$warehouse_arr,$express_arr,$shop_arr);
+			$r = $this->_getData('fullorder', $where_arr, $order_str, 'id,shop,type,orderinfo,number,waybill,express,librarytime', ($page-1)*$perpage, $perpage,$warehouse_arr,$express_arr,$shop_arr,$shop_select_list);
 
 			$info_list = array_merge($info_list, $r['info_list']);
 			$total += $r['total'];
@@ -618,9 +615,15 @@ class Whlabelfz1 extends Start_Controller
 		
 	}
 
-	protected function _getData($tableName, $where, $order, $field, $page, $pagesize,$warehouse_arr,$express_arr,$shop_arr){
-
-		$info_list = $this->db->from($tableName)->where($where)->order_by($order)->select($field)->limit($pagesize, $page)->get()->result_array();
+	protected function _getData($tableName, $where, $order, $field, $page, $pagesize,$warehouse_arr,$express_arr,$shop_arr,$shop_select_list){
+		if(empty($shop_select_list)){
+			$info_list = $this->db->from($tableName)->where($where)->order_by($order)->select($field)->limit($pagesize, $page)->get()->result_array();
+			$total = $this->db->from($tableName)->where($where)->count_all_results();
+		}else{
+			$info_list = $this->db->from($tableName)->where($where)->where_in('shop', $shop_select_list)->order_by($order)->select($field)->limit($pagesize, $page)->get()->result_array();
+			$total = $this->db->from($tableName)->where($where)->where_in('shop', $shop_select_list)->count_all_results();
+		}
+		
 		//格式化数据
 		foreach ($info_list as $key => $value) {
 			$info_list[$key]['shop'] = isset($shop_arr[$value['shop']])? $shop_arr[$value['shop']] : '';
@@ -633,7 +636,7 @@ class Whlabelfz1 extends Start_Controller
 				$info_list[$key]['librarytime'] = '<em class="t">' . date('Y-m-d H:i:s', $value['librarytime']) . '</em>';
 			}
 		}
-		$total = $this->db->from($tableName)->where($where)->count_all_results();
+		
 		return [
 			'info_list' => $info_list,
 			'total' => $total,