From 32f55c47fdce3b8811cd43fbbc7241fe6293dc7d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 8 Apr 2024 11:19:39 +0800
Subject: [PATCH] 1

---
 server/imserver_new/guild/guildmgr.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index 6eff448f..a413eb1d 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -87,15 +87,27 @@ func (this *guildMgr) isNameTooLong(name string, maxNum int) bool {
 }
 
 func (this *guildMgr) GetGuildByGuildId(guildId string) common.Guild {
-	return this.internalGetGuildByGuildId(guildId)
+	if p := this.internalGetGuildByGuildId(guildId); p != nil {
+		return p
+	} else {
+		return nil
+	}
 }
 
 func (this *guildMgr) GetGuildByAccountId(accountId string) common.Guild {
-	return this.internalGetGuildByGuildId(accountId)
+	if p := this.internalGetGuildByAccountId(accountId); p != nil {
+		return p
+	} else {
+		return nil
+	}
 }
 
 func (this *guildMgr) GetGuildByGuildName(guildName string) common.Guild {
-	return this.internalGetGuildByGuildName(guildName)
+	if p := this.internalGetGuildByGuildName(guildName); p != nil {
+		return p
+	} else {
+		return nil
+	}
 }
 
 func (this *guildMgr) internalGetGuildByAccountId(accountId string) *guild {