Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r37875 -r37876 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 37875) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 37876) @@ -2137,7 +2137,7 @@ } } } - if(ipRemark.length() > 0){ + if(ipRemark != null && ipRemark.length() > 0){ InvoicePlan ip = record.getRecyclingApplication(); if(StringUtils.isBlank(ip.getRemark())){ ip.setRemark(ipRemark.substring(0, ipRemark.length() - 1)+"发货后直接回收。");