diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 1663288..521e707 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1043,7 +1043,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep */ private T innerSave(T item) { try { - if(item==null)return null; + if(item ==null) { + return null; + } Class clazz = item.getClass(); //获取主键 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 4dd2b98..cecaee4 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import org.apache.commons.lang3.StringUtils; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * @Description : 数据库脚本封装方法,封装成预加载hql,HqlPack仅限用于一些特定的sql,可能造成性能低下 @@ -363,21 +364,21 @@ public class DdlPreparedPack { * @param columnName * @param packBean */ - public static void getInPackString(String data, String columnName, DdlPackBean packBean) { - if (data != null && data.trim().length() > 0) { - //判断最后一位是不是逗号 - if (data.lastIndexOf(",") != (data.length() - 1)) { - data += ","; - } - String[] dataArray = data.substring(0, data.length() - 1).split(","); - data = ""; - for (int i = 0; i < dataArray.length; i++) { - if (i == dataArray.length - 1) { - data += "'" + dataArray[i] + "'"; - } else { - data += "'" + dataArray[i] + "',"; - } - } + public static void getInPackString(Object[] data, String columnName, DdlPackBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); + } + } + + /** + * 封装in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getInPackString(List data, String columnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " in (:m_" + columnName + ")", data); } }