|
|
@@ -409,10 +409,7 @@ class ShopController extends BaseController {
|
|
|
'CREATED_AT'=> 'O.CREATED_AT',
|
|
|
]);
|
|
|
// $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']);
|
|
|
-
|
|
|
- $condition = $filter['condition'];
|
|
|
- $params = $filter['params'];
|
|
|
- $condition .= ' AND O.IS_DELETE=0';
|
|
|
+ $filter['condition'] .= ' AND O.IS_DELETE=0';
|
|
|
|
|
|
$form = new ShopExportForm();
|
|
|
$result = $form->run($filter, '订单列表');
|