Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r25582 -r25603 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 25582) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 25603) @@ -1988,7 +1988,11 @@ vo.setStatus(data.get("status").getAsString()); } if(data.has("depart")){ - vo.setDepart(data.get("depart").getAsString()); + JsonElement jsonElement = data.get("depart"); + if (!jsonElement.isJsonNull()){ + String depart = jsonElement.getAsString(); + vo.setDepart(depart); + } } // vo.setSterilizerName(sterilizerName);