From 0e1220c329560e58a7848736957fa83af99d3972 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Thu, 14 Nov 2019 17:32:32 +0800
Subject: [PATCH] =?UTF-8?q?Core=20=E6=9C=8D=E5=8A=A1=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 4e34946..99bac14 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
@@ -49,8 +49,8 @@ public class CoreHqlPack {
      */
     public static String packHqlIds(String columnName, String[] params){
         StringBuffer result =  new StringBuffer();
-
-        // 参数数组 [1,2,3] -> "1,2,3"
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         HqlPack.getInPack(String.join(",", params), columnName, result);
         return result.toString();
     }
@@ -63,6 +63,8 @@ public class CoreHqlPack {
      */
     public static String packHqlIds(String columnName, Long[] params){
         StringBuffer result =  new StringBuffer();
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
 
         // 参数数组 [1,2,3] -> "1,2,3"
         HqlPack.getInPack(StringUtils.join(params,","),columnName,result);
@@ -524,13 +526,13 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(user);
 
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
-        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
+//        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
 
         DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
         DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
-        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
+//        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList,"id",result);
         result.setOrderByStr(user.orderBy());