yjp 1 жил өмнө
parent
commit
f411c128b0

+ 7 - 11
convenient/domain/query_rule/query_rule_parser.go

@@ -100,10 +100,6 @@ func (r Rule) checkAsLeaf() error {
 		return errors.New("操作符不支持")
 	}
 
-	if r.Value == nil {
-		return errors.New("没有传递值")
-	}
-
 	return nil
 }
 
@@ -126,13 +122,13 @@ func HasRule(dbSchema string, scope string, domainName string, i *infrastructure
 	})
 }
 
-func GetRulesAndFormConditionClause(dbSchema string, scope string, domainName string, i *infrastructure.Infrastructure, queryParams map[string]any) (clause.Clause, error) {
+func GetRulesAndFormConditionClause(dbSchema string, scope string, domainName string, i *infrastructure.Infrastructure, ruleParams map[string]any) (clause.Clause, error) {
 	r, err := getRule(dbSchema, scope, domainName, i)
 	if err != nil {
 		return nil, err
 	}
 
-	c, err := formConditionClause(r, queryParams)
+	c, err := formConditionClause(r, ruleParams)
 	if err != nil {
 		return nil, err
 	}
@@ -160,11 +156,11 @@ func getRule(dbSchema string, scope string, domainName string, i *infrastructure
 	return *r, nil
 }
 
-func formConditionClause(r Rule, queryParams map[string]any) (clause.Clause, error) {
+func formConditionClause(r Rule, ruleParams map[string]any) (clause.Clause, error) {
 	ruleValue := r.Value
-	queryParamValue, ok := queryParams[r.ColumnName]
+	ruleParamValue, ok := ruleParams[r.ColumnName]
 	if ok {
-		ruleValue = queryParamValue
+		ruleValue = ruleParamValue
 	}
 
 	if strutils.IsStringEmpty(r.LogicalOperator) {
@@ -223,12 +219,12 @@ func formConditionClause(r Rule, queryParams map[string]any) (clause.Clause, err
 		return conditions.And(), nil
 	}
 
-	leftClause, err := formConditionClause(*r.Left, queryParams)
+	leftClause, err := formConditionClause(*r.Left, ruleParams)
 	if err != nil {
 		return nil, err
 	}
 
-	rightClause, err := formConditionClause(*r.Right, queryParams)
+	rightClause, err := formConditionClause(*r.Right, ruleParams)
 	if err != nil {
 		return nil, err
 	}