diff --git a/src/main/java/com/whdc/controller/WarningController.java b/src/main/java/com/whdc/controller/WarningController.java
index 5ea4c87..e798632 100644
--- a/src/main/java/com/whdc/controller/WarningController.java
+++ b/src/main/java/com/whdc/controller/WarningController.java
@@ -65,26 +65,53 @@ public class WarningController {
 
         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, "%")));
+            String[] split = publishUnit.split(",");
+            if (split.length > 1){
+                String str = "(";
+                for (String s : split) {
+                    str += s +",";
+                }
+                str = str.substring(0,str.length()-1) + ")";
+                filter.add(new ApiDto.Filter("publishUnit", "in " + str, ""));
+
+            }else{
+                filter.add(new ApiDto.Filter("publishUnit", "like", String.format("%s%s%s", "%", publishUnit, "%")));
             }
         }
         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, "%")));
+            String[] split = warnSignalLevel.split(",");
+            if (split.length > 1){
+                String str = "(";
+                for (String s : split) {
+                    str += s +",";
+                }
+                str = str.substring(0,str.length()-1) + ")";
+                filter.add(new ApiDto.Filter("warnSignalLevel", "in " + str, ""));
+
+            }else{
+                filter.add(new ApiDto.Filter("warnSignalLevel", "like", String.format("%s%s%s", "%", warnSignalLevel, "%")));
             }
         }
         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, "%")));
+            String[] split = warnSignalType.split(",");
+            if (split.length > 1){
+                String str = "(";
+                for (String s : split) {
+                    str += s +",";
+                }
+                str = str.substring(0,str.length()-1) + ")";
+                filter.add(new ApiDto.Filter("warnSignalType", "in " + str, ""));
+
+            }else{
+                filter.add(new ApiDto.Filter("warnSignalType", "like", String.format("%s%s%s", "%", warnSignalType, "%")));
             }
         }
 
         apiDto.setFilter(filter);
-        //        String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
-        String str = HttpUtil.sendPost("http://127.0.0.1:20000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
+                String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
+//        String str = HttpUtil.sendPost("http://127.0.0.1:20000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
         JSONObject json = JSON.parseObject(str);
         if (json != null && json.getInteger("code") == HttpStatus.SC_OK) {
             List<WarningData> data = json.getJSONArray("data").toJavaList(WarningData.class);
@@ -111,16 +138,53 @@ public class WarningController {
         apiDto.setPageSize(dto.getPageSize());
         ArrayList<ApiDto.Filter> 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)) {
+            String[] split = publishUnit.split(",");
+            if (split.length > 1){
+                String str = "(";
+                for (String s : split) {
+                    str += s +",";
+                }
+                str = str.substring(0,str.length()-1) + ")";
+                filter.add(new ApiDto.Filter("publishUnit", "in " + str, ""));
+
+            }else{
+                filter.add(new ApiDto.Filter("publishUnit", "like", String.format("%s%s%s", "%", publishUnit, "%")));
+            }
         }
-        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)) {
+            String[] split = warnSignalLevel.split(",");
+            if (split.length > 1){
+                String str = "(";
+                for (String s : split) {
+                    str += s +",";
+                }
+                str = str.substring(0,str.length()-1) + ")";
+                filter.add(new ApiDto.Filter("warnSignalLevel", "in " + str, ""));
+
+            }else{
+                filter.add(new ApiDto.Filter("warnSignalLevel", "like", String.format("%s%s%s", "%", warnSignalLevel, "%")));
+            }
         }
-        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)) {
+            String[] split = warnSignalType.split(",");
+            if (split.length > 1){
+                String str = "(";
+                for (String s : split) {
+                    str += s +",";
+                }
+                str = str.substring(0,str.length()-1) + ")";
+                filter.add(new ApiDto.Filter("warnSignalType", "in " + str, ""));
+
+            }else{
+                filter.add(new ApiDto.Filter("warnSignalType", "like", String.format("%s%s%s", "%", warnSignalType, "%")));
+            }
         }
 
+
         apiDto.setFilter(filter);
 //        String str = HttpUtil.sendPost("http://223.75.53.141:8000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));
         String str = HttpUtil.sendPost("http://127.0.0.1:20000/shzh/met/zyqxfw/api/warning/getGroupWarning", JSON.toJSONString(apiDto));