diff --git a/src/main/java/com/seeyon/utils/form/EnumMapUtils.java b/src/main/java/com/seeyon/utils/form/EnumMapUtils.java index ee76691..88ab52c 100644 --- a/src/main/java/com/seeyon/utils/form/EnumMapUtils.java +++ b/src/main/java/com/seeyon/utils/form/EnumMapUtils.java @@ -249,7 +249,7 @@ public class EnumMapUtils { if(enumItemId == null) { return null; } - String str = enumItemId instanceof Long ? String.valueOf(enumItemId) : (enumItemId instanceof String ? (String)enumItemId : null); + String str = enumItemId instanceof Long ? String.valueOf(enumItemId) : enumItemId + ""; if(str == null) { return null; } diff --git a/src/main/java/com/seeyon/utils/form/SqlGenerator.java b/src/main/java/com/seeyon/utils/form/SqlGenerator.java index bda2180..73873d1 100644 --- a/src/main/java/com/seeyon/utils/form/SqlGenerator.java +++ b/src/main/java/com/seeyon/utils/form/SqlGenerator.java @@ -327,11 +327,14 @@ public class SqlGenerator { } switch (factor) { case EQ: return "="; + case NEQ: return "<>"; case GT: return ">"; case GE: return ">="; case LT: return "<"; case LE: return "<="; case LIKE: return "LIKE"; + case IN: return "IN"; + case NOT_IN: return "NOT IN"; case FIND_IN_SET: return "FIND_IN_SET"; case REGEXP: return "REGEXP"; case BETWEEN: return "BETWEEN";