From 9ab737da9c9a86552cf617157358483a90af7a4a Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 10 Mar 2023 14:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E6=83=85=E6=8A=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8C=BA=E5=88=86=E6=88=98=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/gvgHandler.ts | 2 +- shared/db/GVGLeaguePrepare.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game-server/app/servers/guild/handler/gvgHandler.ts b/game-server/app/servers/guild/handler/gvgHandler.ts index 8bc86947b..cab9e24e3 100644 --- a/game-server/app/servers/guild/handler/gvgHandler.ts +++ b/game-server/app/servers/guild/handler/gvgHandler.ts @@ -478,7 +478,7 @@ export class GVGHandler { let myLeague = await GVGLeagueModel.findLeagueByGuild(guildCode); 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 guilds = await GuildModel.findByCodesWithoutPopulate(leagues.reduce((pre, cur) => [...pre, ...cur.guildCodes], [])); const cities = await GVGCityModel.findGuardCity(configId, groupKey); diff --git a/shared/db/GVGLeaguePrepare.ts b/shared/db/GVGLeaguePrepare.ts index 1f8eac607..20ba7b813 100644 --- a/shared/db/GVGLeaguePrepare.ts +++ b/shared/db/GVGLeaguePrepare.ts @@ -157,8 +157,8 @@ export default class GVGLeaguePrepare extends BaseModel { return result; } - public static async getLvRank(configId: number) { - const result: GVGLeaguePrepareType[] = await GVGLeaguePrepareModel.find({ configId }).sort({ lv: -1 }).lean(); + public static async getLvRank(configId: number, groupKey: string) { + const result: GVGLeaguePrepareType[] = await GVGLeaguePrepareModel.find({ configId, groupKey }).sort({ lv: -1 }).lean(); return result; } }