diff --git a/src/main/java/com/lanyuanxiaoyao/service/template/controller/Query.java b/src/main/java/com/lanyuanxiaoyao/service/template/controller/Query.java index 7537b98..115e7ce 100644 --- a/src/main/java/com/lanyuanxiaoyao/service/template/controller/Query.java +++ b/src/main/java/com/lanyuanxiaoyao/service/template/controller/Query.java @@ -141,11 +141,11 @@ public class Query { /** * 指定字段值在指定范围内的条件映射(字段名 -> 值列表) */ - private Map> in; + private Map> inside; /** * 指定字段值不在指定范围内的条件映射(字段名 -> 值列表) */ - private Map> notIn; + private Map> notInside; /** * 指定字段值在指定区间内的条件映射(字段名 -> 区间范围) */ diff --git a/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java b/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java index 86e3ed9..c2475bc 100644 --- a/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java +++ b/src/main/java/com/lanyuanxiaoyao/service/template/service/SimpleServiceSupport.java @@ -316,11 +316,11 @@ public abstract class SimpleServiceSupport implemen predicates.add(builder.lessThanOrEqualTo(path, (Comparable) value)); }); } - if (ObjectHelper.isNotEmpty(queryable.getIn())) { - queryable.getIn().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value))); + if (ObjectHelper.isNotEmpty(queryable.getInside())) { + queryable.getInside().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value))); } - if (ObjectHelper.isNotEmpty(queryable.getNotIn())) { - queryable.getNotIn().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value).not())); + if (ObjectHelper.isNotEmpty(queryable.getNotInside())) { + queryable.getNotInside().forEach((column, value) -> predicates.add(builder.in(column(root, column)).value(value).not())); } if (ObjectHelper.isNotEmpty(queryable.getBetween())) { queryable.getBetween().forEach((column, value) -> {