Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize

master
zhengyongxing 5 years ago
commit cf2cb338f1

@ -34,7 +34,7 @@ class PromoteGameRatioController extends ThinkController
$map['_string'] = 'game_id = relation_game_id';
$where['_string'] = '1 = 1';
if ($companyId || ($companyBelong !== '' && in_array($companyBelong, [0, 1]))) {
$promoteMap['_string'] = '1 = 1';
$promoteMap['level'] = 1;
if ($companyId) {
$promoteMap['company_id'] = $companyId;
}
@ -146,7 +146,7 @@ class PromoteGameRatioController extends ThinkController
$thisPromoteStatus = $thisPromoteStatus ?? '待审核';
$thisPromoteVerStatus = getPromoteVerStatus($promotes[$thisPromoteId]['ver_status'], 2);
$thisCompanyName = getPromoteCompanyName($promotes[$thisPromoteId]['company_id']);
$thisCompanyBelong = $promotes[$thisPromoteId]['company_belong'] == 1 ? '外团' : '内团';
$thisCompanyBelong = $promotes[$thisPromoteId]['company_belong'] ? '外团' : '内团';
}
if ($issetGame) {
$thisGameName = $games[$thisGameId]['relation_game_name'];

Loading…
Cancel
Save