Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16068 -r16069 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16068) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16069) @@ -926,14 +926,16 @@ objectDao.saveOrUpdate(tousseInstance); }*/ - Query updateQuery = objectDao.getHibernateSession().createQuery("update TousseInstance set reviewBasket_id=" + basket.getId() + - " where barcode in :barcode"); - updateQuery.setParameterList("barcode", tousseInstanceBarcodes); - updateQuery.executeUpdate(); - - Query query = objectDao.getHibernateSession().createQuery("from TousseInstance where barcode in :barcode order by barcode"); - query.setParameterList("barcode", tousseInstanceBarcodes); - return query.list(); + if(CollectionUtils.isNotEmpty(tousseInstanceBarcodes)){ + Query updateQuery = objectDao.getHibernateSession().createQuery("update TousseInstance set reviewBasket_id=" + basket.getId() + + " where barcode in :barcode"); + updateQuery.setParameterList("barcode", tousseInstanceBarcodes); + updateQuery.executeUpdate(); + Query query = objectDao.getHibernateSession().createQuery("from TousseInstance where barcode in :barcode order by barcode"); + query.setParameterList("barcode", tousseInstanceBarcodes); + return query.list(); + } + return null; } @Override