From 7876ab6475133020f98e728a7b3fef7c1d729ac8 Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Wed, 3 Apr 2019 18:14:14 +0800
Subject: [PATCH] =?UTF-8?q?hql=E5=B0=81=E8=A3=85=E4=BC=98=E5=8C=96?=
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 |  1 -
 .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java  | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

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 94ed7aa..c052dcc 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
@@ -125,7 +125,6 @@ public class DdlPackBean {
         if(orderByStr != null){
             sb.append(orderByStr);
         }
-        System.out.println("===" + sb.toString());
         return sb.toString();
     }
 
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 cecaee4..f74f02f 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
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import org.apache.commons.lang3.StringUtils;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -338,8 +339,8 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPack(String data, String columnName, DdlPackBean packBean) {
-        if (data != null && data.trim().length() > 0) {
+    public static void getInPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
             packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
         }
     }
@@ -364,9 +365,9 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) {
+    public static void getInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
         if (data != null && data.length > 0) {
-            packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
+            packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", Arrays.asList(data));
         }
     }
 
@@ -377,7 +378,7 @@ public class DdlPreparedPack {
      * @param columnName
      * @param packBean
      */
-    public static void getInPackString(List<?> data, String columnName, DdlPackBean packBean) {
+    public static void getInPackList(List<?> data, String columnName, DdlPackBean packBean) {
         if (data != null && data.size() > 0) {
             packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data);
         }