Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r39817 -r39844 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 39817) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 39844) @@ -3040,21 +3040,23 @@ if(CollectionUtils.isEmpty(updateRecyclingItems)){ return; } - List tis = tousseInstanceManager.getByHql(" exists (select 1 from TousseItem ti where ti.id=po.tousseItemId and ti.invoicePlan.id=" - + recyclingRecord.getRecyclingApplication().getId() - +") and recyclingItemId is null " - + SqlUtils.getInLongListSql("tousseDefinition.id", tdIds)); - if(CollectionUtils.isNotEmpty(tis)){ - for (TousseInstance ti : tis) { - if(intoBasketTousseInstanceIds.contains(ti.getId())){ - continue; - } - for (RecyclingItem ri : updateRecyclingItems) { - if(MathTools.equals(ri.getTousseDefinitionId(), ti.getTousseDefinition().getId())){ - ti.setRecyclingItemId(ri.getId()); - objectDao.update(ti); - break; + if(CollectionUtils.isNotEmpty(tdIds)){ + List tis = tousseInstanceManager.getByHql(" exists (select 1 from TousseItem ti where ti.id=po.tousseItemId and ti.invoicePlan.id=" + + recyclingRecord.getRecyclingApplication().getId() + +") and recyclingItemId is null " + + SqlUtils.getInLongListSql("tousseDefinition.id", tdIds)); + if(CollectionUtils.isNotEmpty(tis)){ + for (TousseInstance ti : tis) { + if(intoBasketTousseInstanceIds.contains(ti.getId())){ + continue; } + for (RecyclingItem ri : updateRecyclingItems) { + if(MathTools.equals(ri.getTousseDefinitionId(), ti.getTousseDefinition().getId())){ + ti.setRecyclingItemId(ri.getId()); + objectDao.update(ti); + break; + } + } } } }