Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageManagerImpl.java =================================================================== diff -u -r16230 -r16877 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageManagerImpl.java (.../RecyclingDamageManagerImpl.java) (revision 16230) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingdamagerecord/service/RecyclingDamageManagerImpl.java (.../RecyclingDamageManagerImpl.java) (revision 16877) @@ -318,12 +318,19 @@ } } + /** + * 回滚相关联的数据 + * @param damage + * @param description + * @param dfValue + */ private void rollBackUnionData(RecyclingDamageItem damage,String description,Integer dfValue) { - - TousseItem item = (TousseItem) objectDao.getByProperty( - TousseItem.class.getSimpleName(), "id", - damage.getTousseItem_ID()); - + TousseItem item = null; + if(damage.getTousseItem_ID() != null){ + item = (TousseItem) objectDao.getByProperty( + TousseItem.class.getSimpleName(), "id", + damage.getTousseItem_ID()); + } appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_RECYCLINGERRORANDDAMAGE, Log.TYPE_DELETE, description);