From 0471038b9bbb6945fccc602e03bac587e77961e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 4 Mar 2020 10:26:23 +0800 Subject: [PATCH] =?UTF-8?q?sqlserver=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 936d73e..103be31 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 @@ -1,23 +1,21 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import cn.estsh.i3plus.pojo.base.util.BeanMapUtils; -import cn.estsh.i3plus.pojo.base.util.StringCastUtils; import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; -import org.hibernate.SQLQuery; -import org.hibernate.transform.Transformers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; -import javax.persistence.*; +import javax.persistence.EntityManager; +import javax.persistence.Id; +import javax.persistence.NoResultException; +import javax.persistence.Query; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -860,7 +858,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql()); + + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) {