|
@@ -11,7 +11,6 @@ import org.springframework.data.domain.PageRequest;
|
|
import org.springframework.data.domain.Pageable;
|
|
import org.springframework.data.domain.Pageable;
|
|
import org.springframework.data.domain.Sort;
|
|
import org.springframework.data.domain.Sort;
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
-import org.springframework.data.jpa.domain.Specifications;
|
|
|
|
|
|
|
|
import javax.persistence.criteria.*;
|
|
import javax.persistence.criteria.*;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
@@ -124,12 +123,12 @@ public class SpecUtils {
|
|
};
|
|
};
|
|
}
|
|
}
|
|
|
|
|
|
- public static Specification andMerge(Specification target1, Specification target2) {
|
|
|
|
|
|
+ /*public static Specification andMerge(Specification target1, Specification target2) {
|
|
return Specifications.where(target1).and(target2);
|
|
return Specifications.where(target1).and(target2);
|
|
}
|
|
}
|
|
|
|
|
|
public static Specification orMerge(Specification target1, Specification target2) {
|
|
public static Specification orMerge(Specification target1, Specification target2) {
|
|
return Specifications.where(target1).or(target2);
|
|
return Specifications.where(target1).or(target2);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
}
|
|
}
|