Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r16972 -r17058 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 16972) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 17058) @@ -947,7 +947,11 @@ }else{ map.put("createDate", ""); } - map.put("inspectName", qmi.getFormDefinition().getFormName()); + String inspectName = qmi.getName(); + if(qmi.getFormDefinition() != null){ + inspectName = qmi.getFormDefinition().getFormName(); + } + map.put("inspectName", inspectName); }else{ map.put("createUserName", ""); map.put("createDate", "");