Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r23909 -r23910 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23909) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23910) @@ -383,7 +383,7 @@ */ public String getUnReturnBorrowApplication(Long invoicePlanId , String departCoding, String tousseNames) { - JSONObject resultJsonObject = new JSONObject(); + JSONObject resultJsonObject = null; JSONArray dataJsonArray = new JSONArray(); if(DatabaseUtil.isPoIdValid(invoicePlanId)){ InvoicePlan invoicePlan = @@ -400,6 +400,7 @@ .getUnReturnBorrowApplication(departCoding); StringBuilder result = new StringBuilder(); if(CollectionUtils.isNotEmpty(borrowApplications)){ + resultJsonObject = new JSONObject(); String[] tousseNameArray = StringUtils.split(tousseNames, ';'); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); List tousseNameList = Arrays.asList(tousseNameArray); @@ -437,9 +438,9 @@ } } resultJsonObject.put("tousseData", dataJsonArray); + resultJsonObject.put("borrowTimes", result.toString()); } - resultJsonObject.put("borrowTimes", result.toString()); - return resultJsonObject.toString(); + return resultJsonObject == null ? "" : resultJsonObject.toString(); } public String getAvailableForReturnTousses(String borrowApplicationIdStr) {