diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 02433ea..830a891 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -176,6 +176,11 @@ class Order extends Backend ]) ->where($where); $filter = (array)json_decode(input()['filter'] ?? '', true); + + if(isset($filter['audit_time'])){ + $build->where('status',\app\admin\model\Order::STATUS_FINISHED); + } + $admin_filter = $filter['user.nickname'] ?? false; $area_id = $filter['area_id'] ?? false; $item_id = $filter['item_id'] ?? false; @@ -878,9 +883,6 @@ class Order extends Backend unset($filter['area_id']); - if(isset($filter['audit_time'])){ - $filter['status'] = \app\admin\model\Order::STATUS_FINISHED; - } $filter = $filter ? $filter : []; $where = []; @@ -913,11 +915,6 @@ class Order extends Backend } $index = 0; $op = (array)json_decode($op, true); - - if(isset($filter['audit_time'])){ - $op['status'] = '='; - } - foreach ($filter as $k => $v) { if ($k == 'user.nickname' || $k == 'is_timeout') continue; if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {