Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r23910 -r23915 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23910) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23915) @@ -400,7 +400,6 @@ .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); @@ -418,6 +417,10 @@ } result.append(dateFormat.format(invoicePlan .getApplicationTime())); + //如果json对象为空,则实例化 + if(resultJsonObject == null){ + resultJsonObject = new JSONObject(); + } } for (String tousseName : unreturnTousses.keySet()) { if(tousseNameList.contains(tousseName)){ @@ -437,8 +440,10 @@ dataJsonArray.add(tousseJsonObject); } } - resultJsonObject.put("tousseData", dataJsonArray); - resultJsonObject.put("borrowTimes", result.toString()); + if(resultJsonObject != null){ + resultJsonObject.put("tousseData", dataJsonArray); + resultJsonObject.put("borrowTimes", result.toString()); + } } return resultJsonObject == null ? "" : resultJsonObject.toString(); }