|
@@ -297,20 +297,32 @@ public class QueryUtil {
|
|
matchList.add(MatchInner);
|
|
matchList.add(MatchInner);
|
|
}
|
|
}
|
|
} else if (itemKeyInner.equals("in") || itemKeyInner.equals("notin")) {
|
|
} else if (itemKeyInner.equals("in") || itemKeyInner.equals("notin")) {
|
|
- HashSet<Object> valueSet = new HashSet<Object>();
|
|
|
|
- List<SceneDataValue> resultArray = parseSet(Repository, sv, itemValueInner, new QueryAssist());
|
|
|
|
- for (SceneDataValue resultItem : resultArray) {
|
|
|
|
- SceneDataValue resultItemValue = (resultItem);
|
|
|
|
- if (!valueSet.contains(resultItemValue.value_primitive)) {
|
|
|
|
- valueSet.add(resultItemValue.value_primitive);
|
|
|
|
|
|
+ if (itemValueInner instanceof JSONObject && ((JSONObject) itemValueInner).containsKey("pass")) {
|
|
|
|
+ if (itemKeyInner.equals("in")) {
|
|
|
|
+ Match_in MatchInner = new Match_in(null);
|
|
|
|
+ MatchInner.pass = true;
|
|
|
|
+ matchList.add(MatchInner);
|
|
|
|
+ } else {
|
|
|
|
+ Match_notin MatchInner = new Match_notin(null);
|
|
|
|
+ MatchInner.pass = true;
|
|
|
|
+ matchList.add(MatchInner);
|
|
}
|
|
}
|
|
- }
|
|
|
|
- if (itemKeyInner.equals("in")) {
|
|
|
|
- Match_in MatchInner = new Match_in(valueSet);
|
|
|
|
- matchList.add(MatchInner);
|
|
|
|
} else {
|
|
} else {
|
|
- Match_notin MatchInner = new Match_notin(valueSet);
|
|
|
|
- matchList.add(MatchInner);
|
|
|
|
|
|
+ HashSet<Object> valueSet = new HashSet<Object>();
|
|
|
|
+ List<SceneDataValue> resultArray = parseSet(Repository, sv, itemValueInner, new QueryAssist());
|
|
|
|
+ for (SceneDataValue resultItem : resultArray) {
|
|
|
|
+ SceneDataValue resultItemValue = (resultItem);
|
|
|
|
+ if (!valueSet.contains(resultItemValue.value_primitive)) {
|
|
|
|
+ valueSet.add(resultItemValue.value_primitive);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (itemKeyInner.equals("in")) {
|
|
|
|
+ Match_in MatchInner = new Match_in(valueSet);
|
|
|
|
+ matchList.add(MatchInner);
|
|
|
|
+ } else {
|
|
|
|
+ Match_notin MatchInner = new Match_notin(valueSet);
|
|
|
|
+ matchList.add(MatchInner);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|