tts
This commit is contained in:
parent
11c9e4c179
commit
8a9499733d
|
|
@ -176,6 +176,11 @@ class Order extends Backend
|
||||||
])
|
])
|
||||||
->where($where);
|
->where($where);
|
||||||
$filter = (array)json_decode(input()['filter'] ?? '', true);
|
$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;
|
$admin_filter = $filter['user.nickname'] ?? false;
|
||||||
$area_id = $filter['area_id'] ?? false;
|
$area_id = $filter['area_id'] ?? false;
|
||||||
$item_id = $filter['item_id'] ?? false;
|
$item_id = $filter['item_id'] ?? false;
|
||||||
|
|
@ -878,9 +883,6 @@ class Order extends Backend
|
||||||
|
|
||||||
unset($filter['area_id']);
|
unset($filter['area_id']);
|
||||||
|
|
||||||
if(isset($filter['audit_time'])){
|
|
||||||
$filter['status'] = \app\admin\model\Order::STATUS_FINISHED;
|
|
||||||
}
|
|
||||||
|
|
||||||
$filter = $filter ? $filter : [];
|
$filter = $filter ? $filter : [];
|
||||||
$where = [];
|
$where = [];
|
||||||
|
|
@ -913,11 +915,6 @@ class Order extends Backend
|
||||||
}
|
}
|
||||||
$index = 0;
|
$index = 0;
|
||||||
$op = (array)json_decode($op, true);
|
$op = (array)json_decode($op, true);
|
||||||
|
|
||||||
if(isset($filter['audit_time'])){
|
|
||||||
$op['status'] = '=';
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($filter as $k => $v) {
|
foreach ($filter as $k => $v) {
|
||||||
if ($k == 'user.nickname' || $k == 'is_timeout') continue;
|
if ($k == 'user.nickname' || $k == 'is_timeout') continue;
|
||||||
if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
|
if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user