🐞 fix(gvg): 情报页面区分战区

This commit is contained in:
luying
2023-03-10 14:39:55 +08:00
parent 621608d0cf
commit 9ab737da9c
2 changed files with 3 additions and 3 deletions

View File

@@ -478,7 +478,7 @@ export class GVGHandler {
let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode); let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode);
if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST); if(!myLeague) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);
const prepares = await GVGLeaguePrepareModel.getLvRank(configId); const prepares = await GVGLeaguePrepareModel.getLvRank(configId, groupKey);
const leagues = await GVGLeagueModel.findByCodes(prepares.map(cur => cur.leagueCode)); const leagues = await GVGLeagueModel.findByCodes(prepares.map(cur => cur.leagueCode));
const guilds = await GuildModel.findByCodesWithoutPopulate(leagues.reduce((pre, cur) => [...pre, ...cur.guildCodes], [])); const guilds = await GuildModel.findByCodesWithoutPopulate(leagues.reduce((pre, cur) => [...pre, ...cur.guildCodes], []));
const cities = await GVGCityModel.findGuardCity(configId, groupKey); const cities = await GVGCityModel.findGuardCity(configId, groupKey);

View File

@@ -157,8 +157,8 @@ export default class GVGLeaguePrepare extends BaseModel {
return result; return result;
} }
public static async getLvRank(configId: number) { public static async getLvRank(configId: number, groupKey: string) {
const result: GVGLeaguePrepareType[] = await GVGLeaguePrepareModel.find({ configId }).sort({ lv: -1 }).lean(); const result: GVGLeaguePrepareType[] = await GVGLeaguePrepareModel.find({ configId, groupKey }).sort({ lv: -1 }).lean();
return result; return result;
} }
} }