|
|
@@ -241,8 +241,23 @@ class BonusController extends BaseController {
|
|
|
'REMARK' => 'REMARK',
|
|
|
'TRANSFER_SN' => 'TRANSFER_SN',
|
|
|
]);
|
|
|
+
|
|
|
+ $condition = $filter['condition'];
|
|
|
+ $params = $filter['params'];
|
|
|
+
|
|
|
+ $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);
|
|
|
+
|
|
|
+ $condition .= " AND U.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
|
|
|
+ }
|
|
|
+
|
|
|
$form = new BonusExportForm();
|
|
|
- $result = $form->run($filter, 'Bonus_Flow'); // 奖金流水
|
|
|
+ $result = $form->run(['condition'=>$condition, 'params'=>$params], 'Bonus_Flow'); // 奖金流水
|
|
|
if (!$result) {
|
|
|
return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
|
|
|
}
|
|
|
@@ -853,8 +868,23 @@ class BonusController extends BaseController {
|
|
|
}
|
|
|
$period = Period::instance();
|
|
|
$yearMonth = $period->getYearMonth($periodNum);
|
|
|
+
|
|
|
+ $condition = $filter['condition'];
|
|
|
+ $params = $filter['params'];
|
|
|
+
|
|
|
+ $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);
|
|
|
+
|
|
|
+ $condition .= " AND CU.COUNTRY_ID IN (" . implode(',', $quotedAdminCountry) . ")";
|
|
|
+ }
|
|
|
+
|
|
|
$form = new BonusExportForm();
|
|
|
- $result = $form->run(array_merge($filter, ['others'=>['yearMonth'=>$yearMonth]]), 'Member Bonus'); // 往期奖金
|
|
|
+ $result = $form->run(array_merge(['condition'=>$condition, 'params'=>$params, 'others'=>['yearMonth'=>$yearMonth]]), 'Member Bonus'); // 往期奖金
|
|
|
if (!$result) {
|
|
|
return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
|
|
|
}
|