diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 8f574cc..692e9ff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -43,6 +43,9 @@ public class PagerHelper { } private static Pager getPager(int pageSize, int currentPage, int totalRows) { + // TODO 10可用系统参数替换 + pageSize = pageSize == 0 ? 10 : pageSize; + Pager pager = new Pager(); pager.setPageSize(pageSize); pager.setTotalRows(totalRows); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index dc5588b..3214b6b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -172,6 +173,10 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result); HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); + // 默认查询非顶级字典 + if(sysDictionary.getParentId() == null || sysDictionary.getParentId() < 1){ + HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(),"parentId",result); + } HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result); return result.toString(); @@ -301,4 +306,15 @@ public class CoreHqlPack { return result.toString(); } + public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){ + StringBuffer result = new StringBuffer(); + + // and + HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); + // not + HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result); + + return result.toString(); + } + } \ No newline at end of file