|
|
@@ -144,27 +144,27 @@ public class JpaUtils {
|
|
|
and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
|
|
|
}
|
|
|
|
|
|
- } else if (Long.class == fieldType) {
|
|
|
- if (value instanceof Collection) {
|
|
|
- if (!((Collection) value).isEmpty()) {
|
|
|
- List list = new ArrayList();
|
|
|
- for (Object o : ((Collection) value)) {
|
|
|
- list.add(Convert.convert(Long.class, o));
|
|
|
- }
|
|
|
- and.add(root.get(property).in(list));
|
|
|
- }
|
|
|
- } else if (value instanceof String && StringUtils.isNotEmpty((String) value)) {
|
|
|
- if (((String) value).contains(",")) {
|
|
|
- String[] arr = ((String) value).split(",");
|
|
|
- List list = new ArrayList();
|
|
|
- for (String s : arr) {
|
|
|
- list.add(Convert.convert(Long.class, s));
|
|
|
- }
|
|
|
- and.add(root.get(property).in(list));
|
|
|
- }
|
|
|
- } else {
|
|
|
- and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
|
|
|
- }
|
|
|
+// } else if (Long.class == fieldType) {
|
|
|
+// if (value instanceof Collection) {
|
|
|
+// if (!((Collection) value).isEmpty()) {
|
|
|
+// List list = new ArrayList();
|
|
|
+// for (Object o : ((Collection) value)) {
|
|
|
+// list.add(Convert.convert(Long.class, o));
|
|
|
+// }
|
|
|
+// and.add(root.get(property).in(list));
|
|
|
+// }
|
|
|
+// } else if (value instanceof String && StringUtils.isNotEmpty((String) value)) {
|
|
|
+// if (((String) value).contains(",")) {
|
|
|
+// String[] arr = ((String) value).split(",");
|
|
|
+// List list = new ArrayList();
|
|
|
+// for (String s : arr) {
|
|
|
+// list.add(Convert.convert(Long.class, s));
|
|
|
+// }
|
|
|
+// and.add(root.get(property).in(list));
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
|
|
|
+// }
|
|
|
} else {
|
|
|
and.add(criteriaBuilder.and(criteriaBuilder.equal(root.get(property), value)));
|
|
|
}
|