Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java =================================================================== diff -u -r14485 -r14493 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java (.../GoodsStockManagerImpl.java) (revision 14485) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java (.../GoodsStockManagerImpl.java) (revision 14493) @@ -46,15 +46,21 @@ private Map getIDTousseDefinitionMap(List goodsStockList){ Map map = new HashMap(); if(CollectionUtils.isNotEmpty(goodsStockList)){ - List ids = goodsStockList.stream().map(gs->gs.getTousseDefinitionId()).collect(Collectors.toList()); - SqlUtils.getNonStringFieldInCollectionsPredicate("id", ids); - List tds = - (List)objectDao.findByIds(TousseDefinition.class.getSimpleName(), ids); - if(CollectionUtils.isNotEmpty(tds)){ - for(TousseDefinition td : tds){ - map.put(td.getId(), td); + List ids = new ArrayList(); + for(GoodsStock gs : goodsStockList){ + if(DatabaseUtil.isPoIdValid(gs.getTousseDefinitionId())){ + ids.add(gs.getTousseDefinitionId()); } } + if(CollectionUtils.isNotEmpty(ids)){ + List tds = + (List)objectDao.findByIds(TousseDefinition.class.getSimpleName(), ids); + if(CollectionUtils.isNotEmpty(tds)){ + for(TousseDefinition td : tds){ + map.put(td.getId(), td); + } + } + } } return map; }