From 6c19e98cfb08320e8d0126013d8b33f146acfb56 Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Tue, 3 Aug 2021 21:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A6=BB=E5=BC=80=E5=86=9B?=
 =?UTF-8?q?=E5=9B=A2=E9=A2=91=E9=81=93=E6=97=B6=E4=B8=8D=E5=86=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/chat/remote/guildRemote.ts        | 2 +-
 game-server/app/servers/connector/handler/entryHandler.ts | 3 ++-
 game-server/app/services/chatChannelService.ts            | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game-server/app/servers/chat/remote/guildRemote.ts b/game-server/app/servers/chat/remote/guildRemote.ts
index cd8764a48..42636e2cd 100644
--- a/game-server/app/servers/chat/remote/guildRemote.ts
+++ b/game-server/app/servers/chat/remote/guildRemote.ts
@@ -126,7 +126,7 @@ export class GuildRemote {
         }, sid);
         // 更新人数减少
         this.updateInfo(guildCode, { memberCnt: guild.memberCnt, guildCe: guild.guildCe });
-        leaveGuildChannel(roleId, sid);
+        leaveGuildChannel(roleId, sid, guildCode);
     }
 
     /**
diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts
index b92982622..cba588d73 100644
--- a/game-server/app/servers/connector/handler/entryHandler.ts
+++ b/game-server/app/servers/connector/handler/entryHandler.ts
@@ -192,6 +192,7 @@ export class EntryHandler {
         let roleId = session.get('roleId');
         let sid = session.get('sid');
         let serverId = session.get('serverId');
+        const guildCode = session.get('guildCode');
         roleLeave(roleId).then(function (roleInfo) {
             if (roleInfo.isOnline) {
                 reportOneOnline(roleId, roleInfo.userCode, sid, roleInfo.pkgName);
@@ -204,7 +205,7 @@ export class EntryHandler {
         this.app.rpc.chat.chatRemote.kickWorldChannel.route(session, true)(roleId, sid, serverId);
         await leaveSysChannel(roleId, sid, serverId);
         await leaveWorldChannel(roleId, sid, serverId);
-        await leaveGuildChannel(roleId, sid);
+        await leaveGuildChannel(roleId, sid, guildCode);
         RoleModel.updateRoleInfo(roleId, { quitTime: nowSeconds() });
     }
 
diff --git a/game-server/app/services/chatChannelService.ts b/game-server/app/services/chatChannelService.ts
index 618399f30..0aba3243a 100644
--- a/game-server/app/services/chatChannelService.ts
+++ b/game-server/app/services/chatChannelService.ts
@@ -67,8 +67,7 @@ export async function leaveCityChannel(roleId: string, sid: string, cityId: numb
 }
 
 
-export async function leaveGuildChannel(roleId: string, sid: string) {
-    const { guildCode } = await RoleModel.findByRoleId(roleId, 'guildCode');
+export async function leaveGuildChannel(roleId: string, sid: string, guildCode: string) {
     if (!guildCode) return;
     const roomId = groupRoomId(CHANNEL_PREFIX.GUILD, guildCode);
     await leaveChannel(roomId, roleId, sid);