From 373615fedd3d1e151f67f5e20947c583fd5f78c5 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 14 Apr 2023 17:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=86=9B=E5=9B=A2=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8):=20=E8=AF=B8=E4=BE=AF=E6=B7=B7=E6=88=98=E5=AE=A3?=
 =?UTF-8?q?=E6=88=98=E5=8F=AF=E8=83=BD=E5=AE=A3=E5=A4=9A=E4=B8=AA=E5=9F=8E?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/db/GuildActivityCityDeclare.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
     }