From efef04f55691173e913d6b28f96c8fb959e39c0d Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Fri, 28 Feb 2025 18:50:44 +0800
Subject: [PATCH] update update group announcement notication.

---
 internal/rpc/group/db_map.go | 13 ++++---------
 internal/rpc/group/group.go  |  7 ++++---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/internal/rpc/group/db_map.go b/internal/rpc/group/db_map.go
index 2ec7c1299..7504bc851 100644
--- a/internal/rpc/group/db_map.go
+++ b/internal/rpc/group/db_map.go
@@ -69,15 +69,10 @@ func UpdateGroupInfoExMap(ctx context.Context, group *pbgroup.SetGroupInfoExReq)
 	}
 
 	if group.Notification != nil {
-		// if Notification only contains spaces, set it to empty string
-		if strings.TrimSpace(group.Notification.Value) != "" {
-			m["notification"] = group.Notification.Value
-			notificationFlag = true
-		} else {
-			m["notification"] = ""
-			group.Notification.Value = ""
-			normalFlag = true
-		}
+		notificationFlag = true
+		group.Notification.Value = strings.TrimSpace(group.Notification.Value) // if Notification only contains spaces, set it to empty string
+
+		m["notification"] = group.Notification.Value
 		m["notification_user_id"] = mcontext.GetOpUserID(ctx)
 		m["notification_update_time"] = time.Now()
 	}
diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go
index 53f854846..264578ca7 100644
--- a/internal/rpc/group/group.go
+++ b/internal/rpc/group/group.go
@@ -1115,8 +1115,9 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
 		tips.OpUser = g.groupMemberDB2PB(opMember, 0)
 	}
 
-	if req.Notification != nil {
-		if notificationFlag {
+	if notificationFlag {
+		if req.Notification.Value != "" {
+
 			conversation := &pbconv.ConversationReq{
 				ConversationID:   msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, req.GroupID),
 				ConversationType: constant.ReadGroupChatType,
@@ -1136,9 +1137,9 @@ func (g *groupServer) SetGroupInfoEx(ctx context.Context, req *pbgroup.SetGroupI
 
 			g.notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser}, &notificationFlag)
 		} else {
+			notificationFlag = false
 			g.notification.GroupInfoSetAnnouncementNotification(ctx, &sdkws.GroupInfoSetAnnouncementTips{Group: tips.Group, OpUser: tips.OpUser}, &notificationFlag)
 		}
-
 	}
 
 	if groupNameFlag {