Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r35600 -r35638 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 35600) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 35638) @@ -2824,12 +2824,14 @@ departGroupNameToShowName = new HashMap(); JSONArray departGroups2 = table.optJSONArray("recyclingDepartGroups"); departGroupIds2 = new HashSet(); - for (Object departGroupsObj : departGroups2) { - JSONObject departGroup = (JSONObject)departGroupsObj; - departGroupIds2.add(departGroup.optLong("id")); - departGroupName = departGroup.optString("recyclingDepartGroupName"); - departGroupNameToShowName.put(departGroupName, departGroup.optString("showRecyclingDepartGroupName")); - break; + if(departGroups2 != null){ + for (Object departGroupsObj : departGroups2) { + JSONObject departGroup = (JSONObject)departGroupsObj; + departGroupIds2.add(departGroup.optLong("id")); + departGroupName = departGroup.optString("recyclingDepartGroupName"); + departGroupNameToShowName.put(departGroupName, departGroup.optString("showRecyclingDepartGroupName")); + break; + } } } sql = getRecyclingDetailSqlForhandleResultSetByRecyclingDetailPrintConfig(fromTime, toTime, handlerDepartCoding, orOrgUnitNameSQL, departGroupIds2, null, extraSql);