From c858475bd24b93fc5f0b8fa7ebfc473f958d3559 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Fri, 5 Jul 2019 19:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java |  9 +++++++++
 .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java    | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
index 52f3324..02c6274 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/DdlPackBean.java
@@ -67,6 +67,15 @@ public class DdlPackBean {
         return result;
     }
 
+    public static DdlPackBean getDdlPackBean(){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+
+        return result;
+    }
+
     public boolean isHql() {
         return isHql;
     }
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 a80ea62..43e4101 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
@@ -196,6 +196,17 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
+        DdlPreparedPack.getInPackList(idList,"id",result);
+
+        result.setOrderByStr(department.orderBy());
+        return result;
+    }
+
     /**
      * 系统权限复杂查询
      * @param menu