|
|
@@ -415,7 +415,7 @@ class ShopController extends BaseController {
|
|
|
'STATUS' => 'O.STATUS',
|
|
|
'IS_AUTO' => 'O.IS_AUTO'
|
|
|
]);
|
|
|
- $filter['condition'] = !$filter['condition'] ? ' 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']);
|
|
|
$form = new ShopExportForm();
|
|
|
$result = $form->run($filter, 'Order_List'); // 订单列表
|
|
|
if (!$result) {
|