support FIND_IN_SET cond (elunez#745)

* fix weird prefixes keys when use RedisUtils.scan * Column use `` for reserved key ref: https://stackoverflow.com/questions/2224503/how-to-map-an-entity-field-whose-name-is-a-reserved-word-in-jpa * add FIND_IN_SET 条件查询 * note
py95 · Jul 4, 2023 · f0ed88c · f0ed88c
1 parent f72efb8
commit f0ed88c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java b/eladmin-common/src/main/java/me/zhengjie/annotation/Query.java
@@ -74,7 +74,9 @@ enum Type {
         // 不为空
         ,NOT_NULL
         // 为空
-        ,IS_NULL
+        ,IS_NULL,
+        // Aborn Jiang 2022/06/01, 对应SQL: SELECT * FROM table WHERE FIND_IN_SET('querytag', table.tags);
+        FIND_IN_SET
     }
 
     /**

diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java b/eladmin-common/src/main/java/me/zhengjie/utils/QueryHelp.java
@@ -166,6 +166,10 @@ public static <R, Q> Predicate getPredicate(Root<R> root, Q query, CriteriaBuild
                                         (Comparable) between.get(0), (Comparable) between.get(1)));
                             }
                             break;
+                        case FIND_IN_SET:
+                            list.add(cb.greaterThan(cb.function("FIND_IN_SET", Integer.class,
+                                    cb.literal(val.toString()), root.get(attributeName)), 0));
+                            break;
                         default: break;
                     }
                 }