diff --git a/shared/db/GuildActivityCityDeclare.ts b/shared/db/GuildActivityCityDeclare.ts index 2406bf17d..83e2ac67e 100644 --- a/shared/db/GuildActivityCityDeclare.ts +++ b/shared/db/GuildActivityCityDeclare.ts @@ -30,7 +30,8 @@ export default class GuildActivityCityDeclare extends BaseModel { // 宣战 public static async declareIfNot(serverId: number, guildCode: string, cityId: number, roleId: string, declareTime: number, isAutoDeclare: boolean, declareIndex: number) { - let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1, declareIndex }, { $setOnInsert: { declareMember: roleId, declareTime, isAutoDeclare, cityId } }, { new: true, upsert: true }).lean(); + await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1, declareIndex }, { $setOnInsert: { cityId: 0 } }, { upsert: true }); + let rec: GuildActivityCityDeclareType = await GuildActivityCityDeclareModel.findOneAndUpdate({ serverId, guildCode, status: 1, declareIndex, cityId: 0 }, { $set: { declareMember: roleId, declareTime, isAutoDeclare, cityId } }, { new: true }).lean(); return rec; }