|
@ -546,7 +546,7 @@ public class RuleServiceImpl implements RuleService { |
|
|
JSONObject conditionObject = conditionArray.getJSONObject(i); |
|
|
JSONObject conditionObject = conditionArray.getJSONObject(i); |
|
|
for (String key : paramsMap.keySet()) { |
|
|
for (String key : paramsMap.keySet()) { |
|
|
if (key.equals(conditionObject.get("ParamCode")) && conditionObject.get("ParamCode") != null) { |
|
|
if (key.equals(conditionObject.get("ParamCode")) && conditionObject.get("ParamCode") != null) { |
|
|
boolean result2 = this.checkCondition(conditionObject, key, params.get(key)); |
|
|
boolean result2 = this.checkCondition(conditionObject, key, paramsMap.get(key)); |
|
|
if (!result2) { |
|
|
if (!result2) { |
|
|
result1 = false; |
|
|
result1 = false; |
|
|
break; |
|
|
break; |
|
|