From ac48851fc08dbf45018d302ccff407296d5e1c98 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 9 Apr 2024 21:08:59 +0800
Subject: [PATCH] 1

---
 server/imserver_new/cache/cachemgr.go | 1 +
 server/imserver_new/guild/guildmgr.go | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/imserver_new/cache/cachemgr.go b/server/imserver_new/cache/cachemgr.go
index 8e597312..7f3f0a92 100644
--- a/server/imserver_new/cache/cachemgr.go
+++ b/server/imserver_new/cache/cachemgr.go
@@ -54,6 +54,7 @@ func (this *cacheMgr) AsyncSearch(sinceId int64, q string,
 			var lastSinceId int64 = sinceId
 			if err != nil {
 				cb(500, "", lastSinceId, []string{})
+				return
 			}
 			users := []string{}
 			for pg.Rows.Next() {
diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go
index de710a40..1061cc88 100644
--- a/server/imserver_new/guild/guildmgr.go
+++ b/server/imserver_new/guild/guildmgr.go
@@ -735,21 +735,22 @@ func (this *guildMgr) AsyncDisband(accountId string, cb func(int32, string, []st
 
 func (this *guildMgr) AsyncSearch(sinceId int64, q string, cb func(int32, string, int64, []string)) {
 	f5.GetJsStyleDb().PageQuery(
-		constant.GAME_DB,
+		constant.FRIEND_DB,
 		50,
 		0,
-		"SELECT guild_id FROM t_user WHERE 1=1",
+		"SELECT idx, guild_id FROM t_guild WHERE 1=1",
 		[]string{},
 		f5.GetDbFilter().Comp(
 			f5.GetDbFilter().GT("idx", q5.ToString(sinceId)).And(),
-			f5.GetDbFilter().GT("deleted", q5.ToString(0)).And(),
-			f5.GetDbFilter().Like("guild_name", q5.ToString(q)).And(),
+			f5.GetDbFilter().EQ("deleted", q5.ToString(0)).And(),
+			f5.GetDbFilter().Like("guild_name", q5.ToString(q)),
 		),
 		"",
 		func (err error, pg *f5.Pagination) {
 			var lastSinceId int64 = sinceId
 			if err != nil {
 				cb(500, "", lastSinceId, []string{})
+				return
 			}
 			guildIds := []string{}
 			for pg.Rows.Next() {