diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/BeanHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/BeanHelp.java index 267a50cf..f6456dfb 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/BeanHelp.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/BeanHelp.java @@ -6,10 +6,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; -import me.zhengjie.aop.limit.PredicateInfo; +import me.zhengjie.annotation.PredicateInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/query/DictQueryService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/query/DictQueryService.java index 62fac563..6fb20d5c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/query/DictQueryService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/query/DictQueryService.java @@ -58,34 +58,4 @@ public class DictQueryService { /** Dong ZhaoYang 2019/6/3 不分页 同理 */ return dictMapper.toDto(dictRepository.findAll((root, query, cb) -> BeanHelp.getPredicate(root, dict, cb))); } - - class Spec implements Specification { - - private DictDTO dict; - - public Spec(DictDTO dict){ - this.dict = dict; - } - - @Override - public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder cb) { - - List list = new ArrayList(); - - if(!ObjectUtils.isEmpty(dict.getName())){ - /** - * 模糊 - */ - list.add(cb.like(root.get("name").as(String.class),"%"+dict.getName()+"%")); - } - if(!ObjectUtils.isEmpty(dict.getRemark())){ - /** - * 模糊 - */ - list.add(cb.like(root.get("remark").as(String.class),"%"+dict.getRemark()+"%")); - } - Predicate[] p = new Predicate[list.size()]; - return cb.and(list.toArray(p)); - } - } }