|
|
@@ -478,7 +478,7 @@ class ShopController extends BaseController {
|
|
|
return "'" . addslashes($item) . "'";
|
|
|
}, $adminCountry);
|
|
|
|
|
|
- $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']) . " AND O.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
|
|
|
+ $filter['condition'] = ('O.IS_DELETE=0 ' . $filter['condition']) . " AND O.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
|
|
|
$form = new ShopExportForm();
|
|
|
$result = $form->run($filter, \Yii::t('ctx', 'shopOrderListExport')); // 订单列表
|
|
|
if (!$result) {
|