From 7b0038c4a4aa8dbd471edf7a14d0e7f9ec64d90c Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 27 May 2024 10:10:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E9=A2=84=E8=AD=A6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../whdc/controller/WarningController.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) 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);