diff --git a/domain/model/cp_m/cp_relation.go b/domain/model/cp_m/cp_relation.go index 50fed84d926699e3baee83f46f9d2ad5121519dd..6f24c9ceab405cc6c43be053c08a03f590da481d 100644 --- a/domain/model/cp_m/cp_relation.go +++ b/domain/model/cp_m/cp_relation.go @@ -209,9 +209,9 @@ func GetCpCancel(model *domain.Model, userIds []uint64, status cp_e.CpCancelStat return res, nil } -func GetCpCancelById(model *domain.Model, id uint64, status cp_e.CpCancelStatus) (*CpCancel, error) { +func GetCpCancelById(model *domain.Model, id, userId uint64) (*CpCancel, error) { res := new(CpCancel) - err := model.DB().Model(CpCancel{}).Where("status = ? and id = ?", status, id).First(&res).Error + err := model.DB().Model(CpCancel{}).Where("id = ? and (user_id = ? or rec_user_id = ?)", id, userId, userId).First(&res).Error if err != nil { if err == gorm.ErrRecordNotFound { return nil, nil diff --git a/route/cp_r/cp_relation.go b/route/cp_r/cp_relation.go index 8743b0445231b9b0e7dd7e0d56cce81fdb4749f2..97461eb7fc63ad797d4170e6933c5b8c37b6a150 100644 --- a/route/cp_r/cp_relation.go +++ b/route/cp_r/cp_relation.go @@ -502,7 +502,7 @@ func CheckCpImExpire(c *gin.Context) (*mycontext.MyContext, error) { resId = common.MSG_ID_ALREADY_EXPIRED } case 2: // 解除的消息im检查是否过期 - cpCancel, err := cp_m.GetCpCancelById(model, msgId, cp_e.CpCancel) + cpCancel, err := cp_m.GetCpCancelById(model, msgId, userId) if err != nil { model.Log.Errorf("CheckCpImExpire userId:%d, msgType:%d, msgId:%d, err:%v", userId, msgType, msgId, err) return myCtx, err