Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r32130 -r32201 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 32130) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 32201) @@ -3123,10 +3123,13 @@ } } } - Set taskGroupSet = SqlUtils.splitStringToSet(taskGroups, ","); + Set taskGroupSet = new HashSet(); + if(StringUtils.isNotBlank(taskGroups) && !taskGroups.contains("全部") && !"-1".equals(taskGroups)){ + taskGroupSet = SqlUtils.splitStringToSet(taskGroups, ","); + } Set tousseGroupIdSet = new HashSet(); - if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("全部")){ + if(StringUtils.isNotBlank(tousseGroupIds) && !tousseGroupIds.contains("全部") && !"-1".equals(tousseGroupIds)){ String[] tousseGroupIdArr = tousseGroupIds.split(","); for (int i = 0; i < tousseGroupIdArr.length; i++) { if(DatabaseUtil.isPoIdValid(tousseGroupIdArr[i])){