From bd0c104431f319b7aaf846548b04f0d33c0bd77b Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Tue, 6 Nov 2018 17:55:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=20=20=20?=
 =?UTF-8?q?=20=20=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=20=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=20get=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=20=20?=
 =?UTF-8?q?=20=20=20=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/common/PagerHelper.java    |  3 +++
 .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java  | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

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