From bf5f72c00bb54bbe187d794d7cc2b1d394938e2c Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 29 Mar 2022 18:36:24 +0800 Subject: [PATCH] mute group --- internal/rpc/group/group.go | 5 ++--- pkg/common/db/mysql_model/im_mysql_model/group_model.go | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 10b3fe2a4..50baff39e 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1029,11 +1029,10 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu log.Error(req.OperationID, "verify failed ", req.OpUserID, req.GroupID) return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } - groupInfo := db.Group{GroupID: req.GroupID} - err := imdb.UpdateGroupInfoDefaultZero(groupInfo, map[string]interface{}{"status": constant.GroupOk}) + err := imdb.UpdateGroupInfoDefaultZero(req.GroupID, map[string]interface{}{"status": constant.GroupOk}) if err != nil { - log.Error(req.OperationID, "UpdateGroupInfoDefaultZero failed ", err.Error(), groupInfo) + log.Error(req.OperationID, "UpdateGroupInfoDefaultZero failed ", err.Error(), req.GroupID) return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil } chat.GroupCancelMutedNotification(req.OperationID, req.OpUserID, req.GroupID) diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_model.go b/pkg/common/db/mysql_model/im_mysql_model/group_model.go index 2d1d0e4db..88dfece8c 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_model.go @@ -216,10 +216,10 @@ func GetGroupMaster(groupId string) (db.GroupMember, error) { return groupMember, nil } -func UpdateGroupInfoDefaultZero(groupInfo db.Group, args map[string]interface{}) error { +func UpdateGroupInfoDefaultZero(groupID string, args map[string]interface{}) error { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { return err } - return dbConn.Model(groupInfo).Updates(args).Error + return dbConn.Model(&db.Group{}).Where("group_id = ? ", groupID).Update(args).Error }