|
|
@@ -408,7 +408,12 @@ class ShopController extends BaseController {
|
|
|
'PERIOD_NUM'=> 'O.PERIOD_NUM',
|
|
|
'CREATED_AT'=> 'O.CREATED_AT',
|
|
|
]);
|
|
|
- $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']);
|
|
|
+// $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';
|
|
|
+
|
|
|
$form = new ShopExportForm();
|
|
|
$result = $form->run($filter, '订单列表');
|
|
|
if (!$result) {
|