Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r36647 -r36650 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 36647) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 36650) @@ -470,7 +470,7 @@ id = application.getId().toString(); } TousseDefinition td = tousseInstance.getTousseDefinition(); - if(idCardInstance != null){ + if(application != null && idCardInstance != null){ RecyclingRecord rr = application.getRecyclingRecord(objectDao);//有回收记录才算回收 if(rr != null){ String sql = String.format("select count(*) from %s where recyclingRecordId=%s "