From 8b2ee5f29a5391a047cecf7b46ca5c2dd82e00a2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 11 Apr 2024 21:30:31 +0800
Subject: [PATCH] 1

---
 server/imserver_new/guild/guild.go | 14 ++------------
 server/imserver_new/model/guild.go |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go
index 7235e437..ee9f6d0b 100644
--- a/server/imserver_new/guild/guild.go
+++ b/server/imserver_new/guild/guild.go
@@ -172,18 +172,8 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) {
 						})
 				}
 			}
-			if this.GetMemberNum() <= 0 {
-				model.Guild.DeleteSoft(this.guildId,
-					func (err error, lastInsertId int64, rowsAffected int64) {
-						if err != nil {
-							cb(500, "server internal error")
-							return
-						}
-						this.disband()
-						cb(0, "")
-						return
-					})
-			}
+			this.disband()
+			cb(0, "")
 		})
 }
 
diff --git a/server/imserver_new/model/guild.go b/server/imserver_new/model/guild.go
index 6e469145..da51bae6 100644
--- a/server/imserver_new/model/guild.go
+++ b/server/imserver_new/model/guild.go
@@ -35,7 +35,7 @@ func (this *guild) DeleteSoft(guildId string,
 		constant.FRIEND_DB,
 		"t_guild",
 		[][]string{
-			{"!guild_name", q5.ToString("'!' + guild_name")},
+			{"!guild_name", q5.ToString("CONCAT(\"!\", `guild_name`)")},
 			{"deleted", "1"},
 		},
 		[][]string{