diff --git a/webht/third_party/pay/models/note_model.php b/webht/third_party/pay/models/note_model.php index 0f30a40c..9bc19894 100644 --- a/webht/third_party/pay/models/note_model.php +++ b/webht/third_party/pay/models/note_model.php @@ -42,7 +42,7 @@ class Note_model extends CI_Model { public function search_date($date) { $this->init(); - $search_sql = " AND pn.IPL_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59' "; + $search_sql = " AND (pn.IPL_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59' or IPL_sent<>'send') "; $this->search = $search_sql; $this->orderby=" ORDER BY CASE pn.IPL_sent WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.IPL_sn DESC "; return $this->get_list(); diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index d5f6c022..71835876 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -45,7 +45,7 @@ class Note_model extends CI_Model { public function search_date($date) { $this->init(); - $search_sql = " AND pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' "; + $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR pn_send<>'send') "; $this->search = $search_sql; $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; return $this->get_list();