diff --git a/modules/rtask/condiFindHandle.go b/modules/rtask/condiFindHandle.go index 5c52fb04e..8e2c784e8 100644 --- a/modules/rtask/condiFindHandle.go +++ b/modules/rtask/condiFindHandle.go @@ -54,7 +54,7 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } @@ -63,11 +63,11 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { + if ok, err1 := soEqual(vals[2], cfg.Data3); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } @@ -76,15 +76,15 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { + if ok, err1 := soEqual(vals[2], cfg.Data3); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { + if ok, err1 := soEqual(vals[3], cfg.Data4); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } @@ -93,19 +93,19 @@ func (this *ModelRtaskRecord) equalParams(cfg *cfg.GameRdtaskCondiData, vals ... err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[1], cfg.Data2); !ok { + if ok, err1 := soEqual(vals[1], cfg.Data2); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[2], cfg.Data3); !ok { + if ok, err1 := soEqual(vals[2], cfg.Data3); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[3], cfg.Data4); !ok { + if ok, err1 := soEqual(vals[3], cfg.Data4); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } - if ok, err1 := soGreatEqual(vals[4], cfg.Data5); !ok { + if ok, err1 := soEqual(vals[4], cfg.Data5); !ok { err = errors.WithMessagef(err1, "id: %v type:%v vals:%v", cfg.Id, cfg.Type, vals) return } diff --git a/modules/rtask/module.go b/modules/rtask/module.go index cfb03ca44..c9869f074 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -260,7 +260,7 @@ func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.T } if condiId, err = v.find(v.cfg, params...); condiId == 0 { if err != nil { - this.Warnln(errors.WithMessage(err, uid).Error()) + this.Warn(errors.WithMessage(err, uid).Error(),log.Fields{}) } } else { condis = append(condis, v)