Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r15325 -r15344 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15325) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 15344) @@ -3261,8 +3261,10 @@ items.add(tousseItem); } } - //设置申请单的使用记录 - recyclingApplication.setUseRecord((UseRecord)objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", useRecordId)); + if(useRecordId != null){ + //设置申请单的使用记录 + recyclingApplication.setUseRecord((UseRecord)objectDao.getByProperty(UseRecord.class.getSimpleName(), "id", useRecordId)); + } saveOrUpdateRecyclingApplication(recyclingApplication,true); list.add(recyclingApplication); }