🐞 fix(gvg): 修复零散小问题

shared/db/GVGCity.ts

@@ -78,8 +78,8 @@ export default class GVGCity extends BaseModel {
     }
 
     // 查询联军驻守情况
-    public static async checkLeagueHasGuard(configId: number, leagueCode: string) {
-        return await GVGCityModel.exists({ configId, guardLeague: leagueCode, hasGuard: true });
+    public static async checkLeagueHasGuard(configId: number, groupKey: string, leagueCode: string) {
+        return await GVGCityModel.exists({ configId: { $lte: configId }, groupKey, guardLeague: leagueCode, hasGuard: true });
     }
 
     // 查询联军驻守情况

shared/db/GVGCityAreaPoint.ts

@@ -37,6 +37,7 @@ export default class GVGCityAreaPoint extends BaseModel {
 
     public static async settlePoint(cityId: number, areaId: number, pointId: number, team: GVGTeamType) {
         let { configId, groupKey, leagueCode, leagueName, roleId, roleName, teamCode } = team;
+        await GVGCityAreaPointModel.updateMany({ configId, groupKey, teamCode }, { $set: { teamCode: '', roleId: '', roleName: '', leagueCode: '', leagueName: '' } });
         await GVGCityAreaPointModel.findOneAndUpdate({ configId, groupKey, pointId }, { $setOnInsert: { teamCode: '' }}, { upsert: true });
         let result: GVGCityAreaPointType = await GVGCityAreaPointModel.findOneAndUpdate(
             { configId, groupKey, pointId, teamCode: '' },

shared/db/GVGLeague.ts

@@ -199,11 +199,6 @@ export default class GVGLeague extends BaseModel {
         let leagues: GVGLeagueType[] = await GVGLeagueModel.find({ isAuto: true, status: 1 }).lean();
         return leagues
     }
-
-    public static async removeAuto(leagueCode: string) {
-        let league: GVGLeagueType = await GVGLeagueModel.findOneAndUpdate({ leagueCode }, { $set: { isAuto: false } }).lean();
-        return league
-    }
 }
 
 export const GVGLeagueModel = getModelForClass(GVGLeague);

shared/domain/gvgField/returnData.ts

@@ -689,6 +689,7 @@ export class GVGAreaInMap {
 // 地图右边列表上的队伍信息
 export class GVGTeamInList {
     areaId: number;
+    pointId: number;
     teamCode: string;
     roleName: string;
     head: number;
@@ -705,6 +706,7 @@ export class GVGTeamInList {
     constructor(team: GVGTeamType) {
         if(!team) return;
         this.areaId = team.areaId;
+        this.pointId = team.pointId;
         this.teamCode = team.teamCode;
         this.roleName = team.roleName;
         this.head = team.head;