Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28760 -r28887 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28760) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28887) @@ -4458,10 +4458,11 @@ // 使用MultiValueMap来把回收记录和借物单相同名称的物品找出来 MultiValueMap groupDatasByName = new MultiValueMap<>(); - for(TousseItem borrowTousseItem: borrowApplication.getApplicationItems()){ - groupDatasByName.put(borrowTousseItem.getTousseName(), borrowTousseItem); + if(borrowApplication != null && CollectionUtils.isNotEmpty(borrowApplication.getApplicationItems())){ + for(TousseItem borrowTousseItem: borrowApplication.getApplicationItems()){ + groupDatasByName.put(borrowTousseItem.getTousseName(), borrowTousseItem); + } } - Map recyclingItemMap = new HashMap<>(); for (RecyclingBasketItemVo json : itemJsonList) { String name = json.getTousseName();