From 212dccad6cb5b6074b54ceb6be5ffe725e18b823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 17 Jun 2020 11:50:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=8C=E5=89=8D=E7=AB=AF=E8=81=94?= =?UTF-8?q?=E8=B0=83=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=84=E4=BB=B6=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 7117863..cb0303b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -139,13 +139,13 @@ public class StationRequestBean implements Serializable { private Boolean stepDialogStatus = false; @ApiParam("是否按时完成") - private Integer isOnTimeComplete; + private Integer isOnTimeComplete = 1; @ApiParam("工位剩余时间") private Long remainWorkTime; @ApiParam("是否操作超时") - private Integer isTimeOut; + private Integer isTimeOut = 2; @ApiParam("特殊展示数据") private Map specialDisplayMap = new HashMap<>(); From fb65b042f07d369c6f3ec60e6818bbf49edd5573 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 14:10:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?getByProperty=20=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 3 +++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 31 +++++++++++----------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 9d06adc..e2e0255 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -243,6 +243,9 @@ public interface BaseRepository extends JpaReposito T getByProperty(String[] propertyNames, Object[] values); + @Deprecated + T getByPropertyPager(String[] propertyNames, Object[] values,Pager pager); + int listCount(); int findByPropertyCount(String propertyName, Object value); 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 2e3d875..d93bac0 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 @@ -46,6 +46,8 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; + /* 默认查询数据条数 */ + private static final Pager DEFAULT_PAGER = new Pager(0,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -506,10 +508,9 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { - try { - List list = findByHqlWhere(packBean); - return list.size() != 0 ? list.get(0) : null; + List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); return null; @@ -521,21 +522,18 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName; - try { - List list = entityManager.createQuery(queryString).setParameter(propertyName, value).getResultList(); - return list.size() != 0 ? list.get(0) : null; - }catch(NoResultException ne){ - LOGGER.error("数据不存在，prop：{},value：{}",propertyName,value,ne); - return null; - }catch(NonUniqueResultException ex){ - LOGGER.error("查询单条记录，但出现多条。prop：{},value：{}",propertyName,value,ex); - throw new RuntimeException("存在多条记录：" + ex.getMessage()); - } + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); } @Override public T getByProperty(String[] propertyNames, Object[] values) { + return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + } + + @Override + public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { + pager = pager == null ? DEFAULT_PAGER: pager; + if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -561,7 +559,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep } try{ - List list = queryObject.getResultList(); + List list = queryObject + .setFirstResult(pager.getStartRow()) + .setMaxResults(pager.getPageSize()) + .getResultList(); return list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在",ne); From 0388c36c411ec438f4590f8a60c19646d7f67d69 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 17 Jun 2020 14:51:48 +0800 Subject: [PATCH 3/6] mes --- .../estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 8 ++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7fc29e9..cc97315 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3248,7 +3248,8 @@ public class MesEnumUtil { BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), - REPAIR(70, "返修插单"); + REPAIR(70, "返修插单"), + FICTIVE(80, "虚拟工单"); private int value; private String description; @@ -4897,7 +4898,8 @@ public class MesEnumUtil { public enum PART_TRAIT { NORMAL(10, "正常件"), FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), - FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"); + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"), + FICTIVE(40, "虚拟件"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b65531b..e2b4a01 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -96,6 +96,26 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("物料特性") private Integer partTrait; + @Column(name = "COLOR_CODE") + @ApiParam("颜色代码") + private String colorCode; + + @Column(name = "SHELVES_AMOUNT") + @ApiParam("挂架数") + private Integer shelvesAmount; + + @Column(name = "QUANTITY_PER_RACK") + @ApiParam("挂架可放零件数") + private Integer quantityPerRack; + + @Column(name = "PAINT_TANK_CODE") + @ApiParam("供漆罐代码") + private String paintTankCode; + + @Column(name = "PRE_PART_NO") + @ApiParam("打磨件物料号") + private String prePartNo; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index f244016..d09d54d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -173,6 +173,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("预留字段5") private String reserved5; + @Column(name = "RESERVED6") + @ApiParam("预留字段6") + private String reserved6; + + @Column(name = "RESERVED7") + @ApiParam("预留字段7") + private String reserved7; + @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") From 25b2109144490dcd8cc198567dbee8250445cc0c Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 15:17:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?getByProperty=20=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/Pager.java | 42 ++++++++++++++++++++++ .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 10 +++--- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index b961226..89e11c0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -31,6 +31,24 @@ public class Pager { @ApiParam("翻页操作") private String pageMethod; + private static final Pager min; + private static final Pager max; + private static final Pager defaultPager; + + static { + min = new Pager(); + min.setCurrentPage(1); + min.setPageSize(10); + + max = new Pager(); + max.setCurrentPage(1); + max.setPageSize(65535); + + defaultPager = new Pager(); + defaultPager.setCurrentPage(1); + defaultPager.setPageSize(100); + } + public Pager() { } @@ -231,6 +249,30 @@ public class Pager { return currentPage > 1; } + /** + * 获取默认最小分页数量 + * @return + */ + public static Pager defaultMinPager(){ + return min; + } + + /** + * 默认最大分页数量 + * @return + */ + public static Pager defaultMaxPager(){ + return max; + } + + /** + * 默认分页数量 + * @return + */ + public static Pager defaultPager(){ + return defaultPager; + } + @Override public String toString() { return "Pager{" + 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 d93bac0..034855d 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 @@ -46,8 +46,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; private SnowflakeIdMaker snowflakeIdMaker; - /* 默认查询数据条数 */ - private static final Pager DEFAULT_PAGER = new Pager(0,10); public BaseRepositoryImpl(Class clz, EntityManager em, SnowflakeIdMaker snowflakeIdMaker) { super(clz, em); @@ -509,7 +507,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(DdlPackBean packBean) { try { - List list = findByHqlWherePage(packBean,DEFAULT_PAGER); + List list = findByHqlWherePage(packBean,Pager.defaultMinPager()); return list != null && list.size() != 0 ? list.get(0) : null; }catch(NoResultException ne){ LOGGER.error("数据不存在，DdlPackBean：{}",packBean); @@ -522,17 +520,17 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public T getByProperty(String propertyName, Object value) { - return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, DEFAULT_PAGER); + return getByPropertyPager(new String[]{propertyName}, new Object[]{value}, Pager.defaultMinPager()); } @Override public T getByProperty(String[] propertyNames, Object[] values) { - return getByPropertyPager(propertyNames, values, DEFAULT_PAGER); + return getByPropertyPager(propertyNames, values, Pager.defaultMinPager()); } @Override public T getByPropertyPager(String[] propertyNames, Object[] values, Pager pager) { - pager = pager == null ? DEFAULT_PAGER: pager; + pager = pager == null ? Pager.defaultMinPager(): pager; if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); From d5051cabdbafe3384bd1fa6280e93c40ebe4beff Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 15:19:20 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=86=99=E5=88=86=E7=A6=BB=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 89e11c0..0a90b00 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -31,8 +31,11 @@ public class Pager { @ApiParam("翻页操作") private String pageMethod; + /* 默认最小数量分页 */ private static final Pager min; + /* 默认最大数量分页 */ private static final Pager max; + /* 默认数量分页 */ private static final Pager defaultPager; static { From 91f4edc83f686c2e547eba99e05582af4ed0d44d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 17 Jun 2020 15:38:55 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=86=99=E5=88=86=E7=A6=BB=20=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 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 034855d..3d220a2 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 @@ -390,7 +390,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List listPager(Pager pager) { - if (pager.getTotalRows() > 0) { + if (pager != null) { return entityManager.createQuery("from " + persistentClass.getName()) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -647,7 +647,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff; return entityManager.createQuery(queryString) .setParameter(propertyName, value) @@ -659,7 +659,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -790,7 +790,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) { - if(pager.getTotalRows() > 0){ + if(pager != null){ if(propertyNames.length != values.length){ throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length); } @@ -825,7 +825,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Deprecated @Override public List findByHqlWherePage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -844,7 +844,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWherePage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); @@ -922,7 +922,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hqlWhere, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ StringBuffer queryString = new StringBuffer(); queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 "); @@ -941,7 +941,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(DdlPackBean packBean, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ Query query = entityManager.createQuery("from " + persistentClass.getSimpleName() + " as model where 1=1 " + packBean.getPackedHql()); @@ -959,7 +959,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -987,7 +987,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -999,7 +999,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlPage(String sql, Class entity, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createNativeQuery(sql,entity) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize()) @@ -1112,7 +1112,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) { - if(pager.getTotalRows() > 0) { + if(pager != null) { StringBuffer queryString = new StringBuffer(); queryString.append(hql + " as model where 1=1 "); @@ -1151,7 +1151,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList(); }else{ return new ArrayList(); @@ -1160,7 +1160,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) { - if(pager.getTotalRows() > 0) { + if(pager != null) { Query queryObject = entityManager.createQuery(hql); for (int i = 0; i < paramName.length; i++) { if (paramValue[i] != null) { @@ -1181,7 +1181,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findBySqlObjListByPager(String sql, Pager pager) { - if(pager.getTotalRows() > 0){ + if(pager != null){ return entityManager.createNativeQuery(sql) .setFirstResult(pager.getStartRow()) .setMaxResults(pager.getPageSize())