diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index fca7f7d..3d0a639 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -271,7 +271,7 @@ public class DdlPreparedPack { } /** - * 封装long或者int的整数对象成equal语句 + * 封装long或者int的正整数对象成equal语句 * * @param columnName 列名 * @param packBean @@ -283,6 +283,18 @@ public class DdlPreparedPack { } /** + * 封装long或者int的负整数对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ + public static void getNegativeNumEqualPack(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); + } + } + + /** * 封装long或者int的整数对象成equal语句 * * @param columnName 列名 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 0e00662..dea5ebf 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -329,4 +329,25 @@ public final class FormHqlPack { return ddlPackBean; } + + + /** + * 菜单树顺序 + * @param bfMenu 菜单目录 + * @return hql + */ + public static DdlPackBean packHqlBfMenuTree(BfMenu bfMenu) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); + DdlPreparedPack.getNumEqualPack( + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + // 按顺序字段进行排序 + bfMenu.setOrderByParam("menuSort"); + bfMenu.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue()); + result.setOrderByStr(bfMenu.orderBy()); + + return result; + } }