From fc391d0a91edc8aa87b662735e124ed943264788 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Fri, 12 May 2023 16:42:37 +0800
Subject: [PATCH] update

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

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