diff --git a/webapp/models/Season.php b/webapp/models/Season.php index bd39d441..ea8fd10e 100644 --- a/webapp/models/Season.php +++ b/webapp/models/Season.php @@ -22,6 +22,19 @@ class Season extends BaseModel { return $row; } + public static function findByAccount($accountId,$seasonId) + { + $row = SqlHelper::ormSelectOne( + myself()->_getSelfMysql(), + 't_season', + array( + 'account_id' => $accountId, + 'season_id' => $seasonId, + ) + ); + return $row; + } + public static function toDto($row) { return array( diff --git a/webapp/models/User.php b/webapp/models/User.php index 46bd9a3d..086522bd 100644 --- a/webapp/models/User.php +++ b/webapp/models/User.php @@ -214,7 +214,7 @@ class User extends BaseModel { $currSeasonMeta = mt\RankSeason::getCurrentSeason(); $gameTimes = 0; if ($currSeasonMeta){ - $season = Season::find($currSeasonMeta['id']); + $season = Season::findByAccount($row['account_id'],$currSeasonMeta['id']); if ($season){ $battleData = json_decode($season['battle_data'], true); $seasonBattleData = isset($battleData) ? getXVal($battleData, 'season_data', array()) : array();