Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r14892 -r14909 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14892) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 14909) @@ -212,12 +212,10 @@ for (Long tousseDefinitionID : tousseMap.keySet()) { Integer amount = tousseMap.get(tousseDefinitionID); TousseItem tousseItem = null; - //一个包装两个篮筐保存 + for (TousseItem ti : items) { - if(ti.getTousseDefinitionId() == null){ - throw new RuntimeException(ti.getTousseName() + ",数据异常!"); - } - if(ti.getTousseDefinitionId().longValue() == tousseDefinitionID.longValue()){ + Long ti_tdId = ti.getTousseDefinitionId(); + if(ti_tdId != null && ti_tdId.longValue() == tousseDefinitionID.longValue()){ tousseItem = ti; } }