修复最大值、最小值处理翻了的BUG
This commit is contained in:
@ -126,8 +126,8 @@ func (r validateRule) Maximum(structField reflect.StructField) *int64 {
|
||||
ruleTable := r.getValidateRuleTable(structField)
|
||||
var (
|
||||
err error
|
||||
maxVal, gleVal int64
|
||||
maxStr, gleStr string
|
||||
maxVal, lteVal int64
|
||||
maxStr, lteStr string
|
||||
maxStrExist, gleStrExist bool
|
||||
)
|
||||
if maxStr, maxStrExist = ruleTable[consts.ValidatorRuleCommonMax.String()]; maxStrExist && len(maxStr) > 0 {
|
||||
@ -135,9 +135,9 @@ func (r validateRule) Maximum(structField reflect.StructField) *int64 {
|
||||
panic("validate rule min val = " + maxStr + " : " + err.Error())
|
||||
}
|
||||
}
|
||||
if gleStr, gleStrExist = ruleTable[consts.ValidateRuleLte.String()]; gleStrExist && len(gleStr) > 0 {
|
||||
if gleVal, err = strconv.ParseInt(gleStr, 10, 64); nil != err {
|
||||
panic("validate rule gte val = " + gleStr + " : " + err.Error())
|
||||
if lteStr, gleStrExist = ruleTable[consts.ValidateRuleLte.String()]; gleStrExist && len(lteStr) > 0 {
|
||||
if lteVal, err = strconv.ParseInt(lteStr, 10, 64); nil != err {
|
||||
panic("validate rule gte val = " + lteStr + " : " + err.Error())
|
||||
}
|
||||
}
|
||||
if !maxStrExist && !gleStrExist {
|
||||
@ -145,15 +145,15 @@ func (r validateRule) Maximum(structField reflect.StructField) *int64 {
|
||||
return nil
|
||||
}
|
||||
if len(maxStr) > 0 {
|
||||
if len(gleStr) > 0 {
|
||||
if gleVal > maxVal {
|
||||
return &gleVal
|
||||
if len(lteStr) > 0 {
|
||||
if lteVal > maxVal {
|
||||
return <eVal
|
||||
}
|
||||
return &maxVal
|
||||
}
|
||||
return &maxVal
|
||||
}
|
||||
return &gleVal
|
||||
return <eVal
|
||||
}
|
||||
|
||||
// getValidateRuleTable 解析验证规则表
|
||||
|
Reference in New Issue
Block a user