diff --git a/src/main/java/com/whdc/controller/WarningController.java b/src/main/java/com/whdc/controller/WarningController.java index d7962e2..5ea4c87 100644 --- a/src/main/java/com/whdc/controller/WarningController.java +++ b/src/main/java/com/whdc/controller/WarningController.java @@ -63,14 +63,23 @@ public class WarningController { apiDto.setPageSize(dto.getPageSize()); ArrayList filter = Lists.newArrayList(); - if (StringUtils.isNotBlank(dto.getPublishUnit())) { - filter.add(new ApiDto.Filter("publishUnit", "LIKE", String.format("%s%s%s", "%", dto.getPublishUnit(), "%"))); + String publishUnit = dto.getPublishUnit(); + if (StringUtils.isNotBlank(publishUnit)) { + for (String s : publishUnit.split(",")) { + filter.add(new ApiDto.Filter("publishUnit", "LIKE", String.format("%s%s%s", "%", s, "%"))); + } } - if (StringUtils.isNotBlank(dto.getWarnSignalLevel())) { - filter.add(new ApiDto.Filter("warnSignalLevel", "LIKE", String.format("%s%s%s", "%", dto.getWarnSignalLevel(), "%"))); + String warnSignalLevel = dto.getWarnSignalLevel(); + if (StringUtils.isNotBlank(warnSignalLevel)) { + for (String s : warnSignalLevel.split(",")) { + filter.add(new ApiDto.Filter("warnSignalLevel", "LIKE", String.format("%s%s%s", "%", s, "%"))); + } } - if (StringUtils.isNotBlank(dto.getWarnSignalType())) { - filter.add(new ApiDto.Filter("warnSignalType", "LIKE", String.format("%s%s%s", "%", dto.getWarnSignalType(), "%"))); + String warnSignalType = dto.getWarnSignalType(); + if (StringUtils.isNotBlank(warnSignalType)) { + for (String s : warnSignalType.split(",")) { + filter.add(new ApiDto.Filter("warnSignalType", "LIKE", String.format("%s%s%s", "%", s, "%"))); + } } apiDto.setFilter(filter);