|
@@ -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.Path;
|
|
import javax.persistence.criteria.Path;
|
|
import javax.persistence.criteria.Predicate;
|
|
import javax.persistence.criteria.Predicate;
|
|
@@ -168,7 +167,7 @@ public class SpecUtils {
|
|
* @param specs
|
|
* @param specs
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public static Specification andMerge(Specification... specs) {
|
|
|
|
|
|
+ /*public static Specification andMerge(Specification... specs) {
|
|
if (specs == null || specs.length == 0) {
|
|
if (specs == null || specs.length == 0) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
@@ -183,7 +182,7 @@ public class SpecUtils {
|
|
}
|
|
}
|
|
|
|
|
|
return result;
|
|
return result;
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
/**
|
|
/**
|
|
* 合并查询条件
|
|
* 合并查询条件
|
|
@@ -193,7 +192,7 @@ public class SpecUtils {
|
|
* @param specs
|
|
* @param specs
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public static Specification orMerge(Specification... specs) {
|
|
|
|
|
|
+ /*public static Specification orMerge(Specification... specs) {
|
|
if (specs == null || specs.length == 0) {
|
|
if (specs == null || specs.length == 0) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
@@ -208,6 +207,6 @@ public class SpecUtils {
|
|
}
|
|
}
|
|
|
|
|
|
return result;
|
|
return result;
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
}
|
|
}
|