|
|
@@ -495,14 +495,20 @@ class ShopController extends BaseController {
|
|
|
'IS_AUTO' => 'O.IS_AUTO'
|
|
|
]);
|
|
|
|
|
|
- $adminId = Yii::$app->getUser()->getUserInfo()['id'];
|
|
|
- $adminCountry = AdminCountry::getCountry($adminId);
|
|
|
+ $isSuper = AdminRole::isSuperAdmin(\Yii::$app->getUser()->getUserInfo()['roleId']);
|
|
|
+ if (!$isSuper) {
|
|
|
+ $adminId = Yii::$app->getUser()->getUserInfo()['id'];
|
|
|
+ $adminCountry = AdminCountry::getCountry($adminId);
|
|
|
+
|
|
|
+ $quotedAdminCountry = array_map(function($item) {
|
|
|
+ return "'" . addslashes($item) . "'";
|
|
|
+ }, $adminCountry);
|
|
|
|
|
|
- $quotedAdminCountry = array_map(function($item) {
|
|
|
- return "'" . addslashes($item) . "'";
|
|
|
- }, $adminCountry);
|
|
|
+ $filter['condition'] = ('O.IS_DELETE=0 ' . $filter['condition']) . " AND O.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
|
|
|
+ } else {
|
|
|
+ $filter['condition'] = ('O.IS_DELETE=0 ' . $filter['condition']);
|
|
|
+ }
|
|
|
|
|
|
- $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) {
|