Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java =================================================================== diff -u -r27812 -r27849 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 27812) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 27849) @@ -551,8 +551,12 @@ list = invoicePlanOptimizeManager .getWaitDeliverGoods(null , orgUnitCoding, null, applyDate, tousseType,disposableGoodsType, sterilingMethods,tousseGroupIds, appFormType); } - - JSONArray jsonArray = JSONArray.fromObject(list); + JSONArray jsonArray = null; + if(list == null){ + jsonArray = new JSONArray(); + }else{ + jsonArray = JSONArray.fromObject(list); + } StrutsResponseUtils.output(jsonArray); }