diff --git a/src/main/java/com/peanut/modules/master/controller/MessageController.java b/src/main/java/com/peanut/modules/master/controller/MessageController.java
index 8b2617b8..60c4c2e6 100644
--- a/src/main/java/com/peanut/modules/master/controller/MessageController.java
+++ b/src/main/java/com/peanut/modules/master/controller/MessageController.java
@@ -27,20 +27,18 @@ public class MessageController {
     @RequestMapping("/listByPage")
     public R listByPage(@RequestBody Map<String, Object> params) {
         LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper();
-        if (params.containsKey("title")&& StringUtils.isNotEmpty(params.get("title").toString())) {
+        if (StringUtils.isNotEmpty(params.get("title").toString())) {
             wrapper.like(Message::getTitle,params.get("title"));
         }
-        if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) {
+        if (StringUtils.isNotEmpty(params.get("type").toString())) {
             wrapper.eq(Message::getType,params.get("type"));
         }
-        if (params.containsKey("isBook")&& StringUtils.isNotEmpty(params.get("isBook").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isBook"));
-        }
-        if (params.containsKey("isMedical")&& StringUtils.isNotEmpty(params.get("isMedical").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isMedical"));
-        }
-        if (params.containsKey("isSociology")&& StringUtils.isNotEmpty(params.get("isSociology").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isSociology"));
+        if (StringUtils.isNotEmpty(params.get("isBook").toString())||
+                StringUtils.isNotEmpty(params.get("isMedical").toString())||
+                StringUtils.isNotEmpty(params.get("isSociology").toString())) {
+            wrapper.and(t->t.eq("1".equals(params.get("isBook").toString()),Message::getIsBook,params.get("isBook"))
+                    .or().eq("1".equals(params.get("isMedical").toString()),Message::getIsMedical,params.get("isMedical"))
+                    .or().eq("1".equals(params.get("isSociology").toString()),Message::getIsSociology,params.get("isSociology")));
         }
         wrapper.orderByDesc(Message::getCreateTime);
         Page<Message> page = messageService.page(new Page<>(