diff --git a/internal/push/push_to_client.go b/internal/push/push_to_client.go index 6cf3f558b..246431015 100644 --- a/internal/push/push_to_client.go +++ b/internal/push/push_to_client.go @@ -228,10 +228,10 @@ func (p *Pusher) Push2SuperGroup(ctx context.Context, groupID string, msg *sdkws return err } log.ZInfo(ctx, "GroupDismissedNotificationInfo****", "groupID", groupID, "num", len(pushToUserIDs), "list", pushToUserIDs) - if len(config.Config.Manager.UserID) > 0 { + if config.Config.Manager.UserID[0] != "" { ctx = mcontext.WithOpUserIDContext(ctx, config.Config.Manager.UserID[0]) } - if len(config.Config.Manager.UserID) == 0 && len(config.Config.IMAdmin.UserID) > 0 { + if config.Config.Manager.UserID[0] == "" && len(config.Config.IMAdmin.UserID) > 0 { ctx = mcontext.WithOpUserIDContext(ctx, config.Config.IMAdmin.UserID[0]) } defer func(groupID string) { diff --git a/internal/rpc/msg/revoke.go b/internal/rpc/msg/revoke.go index 91ded4827..116bef4f7 100644 --- a/internal/rpc/msg/revoke.go +++ b/internal/rpc/msg/revoke.go @@ -112,10 +112,10 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg. } revokerUserID := mcontext.GetOpUserID(ctx) var flag bool - if len(config.Config.Manager.UserID) > 0 { + if config.Config.Manager.UserID[0] != "" { flag = utils.Contain(revokerUserID, config.Config.Manager.UserID...) } - if len(config.Config.Manager.UserID) == 0 { + if config.Config.Manager.UserID[0] == "" && len(config.Config.IMAdmin.UserID) > 0 { flag = utils.Contain(revokerUserID, config.Config.IMAdmin.UserID...) } tips := sdkws.RevokeMsgTips{