From 76c2db3a85acda65f4c51032c3b284ce4623b5ca Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 12 May 2023 16:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E4=BC=9A=E8=A7=A3?=
 =?UTF-8?q?=E6=95=A3CD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sociaty/api_cross_dismiss.go | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/sociaty/api_cross_dismiss.go b/modules/sociaty/api_cross_dismiss.go
index 0823f0856..3e7c2bb96 100644
--- a/modules/sociaty/api_cross_dismiss.go
+++ b/modules/sociaty/api_cross_dismiss.go
@@ -46,17 +46,28 @@ func (this *apiComp) Dismiss(session comm.IUserSession, req *pb.SociatyDismissRe
 	globalCnf := this.module.globalConf
 	var isUpdate bool
 	if sociaty.DismissTime == 0 {
-		//更新解散倒计时
-		update["dismissTime"] = utils.AddHour(int(globalCnf.GuildDissolutionCountDownCd)).Unix()
-		isUpdate = true
-	} else {
-		if req.Dismiss == 1 { //取消解散
+		if sociaty.DismissCD == 0 {
+			//更新解散倒计时
+			update["dismissTime"] = utils.AddHour(int(globalCnf.GuildDissolutionCountDownCd)).Unix()
+		} else {
 			if utils.IsInCDHour(int64(sociaty.DismissCD)) {
 				code = pb.ErrorCode_SociatyCDLimit
 				return
 			} else {
+				update["dismissCD"] = utils.AddHour(int(globalCnf.GuildDissolutionCd)).Unix()
+			}
+		}
+		isUpdate = true
+	} else {
+		if req.Dismiss == 1 { //取消解散
+			if sociaty.DismissCD == 0 {
 				// 设置冷区时间
 				update["dismissCD"] = utils.AddHour(int(globalCnf.GuildDissolutionCd)).Unix()
+			} else {
+				if utils.IsInCDHour(int64(sociaty.DismissCD)) {
+					code = pb.ErrorCode_SociatyCDLimit
+					return
+				}
 			}
 			//取消倒计时
 			update["dismissTime"] = 0