diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php index bf144eda..370333a4 100644 --- a/admin/libraries/OrdersList.php +++ b/admin/libraries/OrdersList.php @@ -113,20 +113,18 @@ class OrdersList } //是否有合同 - $order_time[0] && $where_od['u_time >='] = $order_time[0] . ' 00:00:00'; - if ($params['iscontract'] == 1) { + if ($params['iscontract']) { $where_od['contract_img <>'] = ''; - } - if ($params['iscontract'] == 2) { - $where_od['contract_img'] = ''; - } - - if(count($where_od) > 0){ + $order_time[0] && $where_od['u_time >='] = $order_time[0] . ' 00:00:00'; $rows_od = $this->ci->mdOrderData->select($where_od, '', 0, 0, 'o_id'); - if ($rows_od) { - $str_ids = implode(',', array_column($rows_od, 'o_id')); + $rows_od && $str_ids = implode(',', array_column($rows_od, 'o_id')); + + if($params['iscontract'] == 1){ $where["id in({$str_ids})"] = null; + }else{ + $where["id not in({$str_ids})"] = null; } + } //是否开票