|
|
@@ -214,12 +214,12 @@ class ordersendlistControl extends SystemControl
|
|
|
|
|
|
$base_cond['refill_order.inner_status'] = 0;
|
|
|
|
|
|
- if(empty($_GET['order_state'])) {
|
|
|
- $base_cond['vr_order.order_state'] = ['in', [ORDER_STATE_CANCEL, ORDER_STATE_SEND]];
|
|
|
- } else {
|
|
|
+ if(!empty($_GET['order_state'])) {
|
|
|
$base_cond['vr_order.order_state'] = intval($_GET['order_state']);
|
|
|
-
|
|
|
}
|
|
|
+// else {
|
|
|
+// $base_cond['vr_order.order_state'] = ['in', [ORDER_STATE_CANCEL, ORDER_STATE_SEND]];
|
|
|
+// }
|
|
|
|
|
|
$all_mchids = $this->getAllTransferMchid();
|
|
|
if (!empty($_GET['mchid'])) {
|
