diff --git a/game-server/app/servers/guild/handler/gvgBattleHandler.ts b/game-server/app/servers/guild/handler/gvgBattleHandler.ts
index 1e868afbf..8db15eb81 100644
--- a/game-server/app/servers/guild/handler/gvgBattleHandler.ts
+++ b/game-server/app/servers/guild/handler/gvgBattleHandler.ts
@@ -81,7 +81,17 @@ export class GVGBattleHandler {
 
     // 进入城池之前的检查
     async checkMyTeam(msg: { cityId: number }, session: BackendSession) {
-
+        if(!checkGVGPeriod(GVG_PERIOD.BATTLE)) return resResult(STATUS.GVG_NOT_BATTLE_PERIOD);
+        const roleId = session.get('roleId');
+        const { cityId } = msg;
+        const resData = {};
+        const teams = await GVGTeamModel.findByRole(roleId);
+        // 玩家队伍信息中城池id不一致，说明玩家已经进入了其他城池
+        if (teams && teams.length > 0 && teams[0].cityId && teams[0].cityId !== cityId) {
+            resData['hasSettled'] = true;
+            resData['cityId'] = teams[0].cityId;
+        }
+        return resResult(STATUS.SUCCESS, resData);
     }
 
     // 进入城池