feat:字典规则调整允许值为空

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

@@ -254,18 +254,29 @@ public class DdlPreparedPack {
     }
 
     /**
-     * 封装String对象成equal语句
+     * 封装String对象成equal语句,不封装空值，空字符串
      *
      * @param columnName 列名
      * @param packBean
      */
     public static void getStringEqualPack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
+            getStringEqualAndAllowBlankPack(val, columnName, packBean);
         }
     }
 
     /**
+     * 封装String对象成equal语句,封装空值，空字符串
+     *
+     * @param val 条件
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringEqualAndAllowBlankPack(String val, String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(columnName, " and model." + columnName + " = :m_" + columnName, val);
+    }
+
+    /**
      * 封装String对象成equal语句
      *
      * @param columnName 列名

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -662,7 +662,7 @@ public class CoreHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         // and
-        DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
+        DdlPreparedPack.getStringEqualAndAllowBlankPack(dictionary.getDictionaryValue(), "dictionaryValue", result);
         DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
         DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result);
         // not