From 197aebdcdde2f73d5a2aeaa32bdc98968f436bec Mon Sep 17 00:00:00 2001
From: mamengke01 <794347210@qq.com>
Date: Mon, 22 Feb 2021 15:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=E7=BB=83=E5=85=B5=E5=9C=BA?=
 =?UTF-8?q?=E6=8C=91=E6=88=98=E6=AC=A1=E6=95=B0bug=E5=92=8C=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/guildTrainService.ts | 2 +-
 shared/db/GuildTrain.ts                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/game-server/app/services/guildTrainService.ts b/game-server/app/services/guildTrainService.ts
index 6a1d90e0e..3cd878865 100644
--- a/game-server/app/services/guildTrainService.ts
+++ b/game-server/app/services/guildTrainService.ts
@@ -18,7 +18,7 @@ import { getMailContent } from './mailService';
 import { MAIL_TYPE } from '../consts';
 
 export async function getUserGuild(roleId: string, serverId: number) {
-    let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards guildCode');
+    let userGuild = await UserGuildModel.getMyGuild(roleId,'trainCount trainTime trainRewards guildCode buyTrainCount');
     if (!userGuild)
         return;
     let { trainCount, trainTime, buyTrainCount, guildCode} = userGuild;
diff --git a/shared/db/GuildTrain.ts b/shared/db/GuildTrain.ts
index 9b45cd60f..f22b065f2 100644
--- a/shared/db/GuildTrain.ts
+++ b/shared/db/GuildTrain.ts
@@ -95,7 +95,7 @@ export default class GuildTrain extends BaseModel {
     }
 
     public static async resetGuildTrain(guildCode: string) {
-        const result = await GuildTrainModel.updateMany({guildCode}, {$set:{locked: false}});
+        const result = await GuildTrainModel.updateMany({guildCode}, {$set:{ locked: true }});
         return result;
     }