Просмотр исходного кода

feat: EK-856: 管理员增加“Country”属性.

kevinElken 10 месяцев назад
Родитель
Сommit
824038d580
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      backendApi/modules/v1/controllers/ShopController.php

+ 1 - 1
backendApi/modules/v1/controllers/ShopController.php

@@ -478,7 +478,7 @@ class ShopController extends BaseController {
             return "'" . addslashes($item) . "'";
             return "'" . addslashes($item) . "'";
         }, $adminCountry);
         }, $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();
         $form = new ShopExportForm();
         $result = $form->run($filter, \Yii::t('ctx', 'shopOrderListExport')); // 订单列表
         $result = $form->run($filter, \Yii::t('ctx', 'shopOrderListExport')); // 订单列表
         if (!$result) {
         if (!$result) {