Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -451,7 +451,7 @@ public class DdlPreparedPack {
      * @param packBean
      */
     public static void getOrInPack(String data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," or model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }
@@ -541,8 +541,8 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getNotInPack(String data, String columnName, DdlPackBean packBean) {
+    public static void getNotInPack(Object data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);
         }
     }