diff --git a/src/main/java/com/peanut/modules/sys/controller/VisitorController.java b/src/main/java/com/peanut/modules/sys/controller/VisitorController.java index c55a4ace..eb7b3f4e 100644 --- a/src/main/java/com/peanut/modules/sys/controller/VisitorController.java +++ b/src/main/java/com/peanut/modules/sys/controller/VisitorController.java @@ -224,10 +224,18 @@ public class VisitorController { @RequestMapping("/listByPage") public R listByPage(@RequestBody Message message) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.eq(message.getIsBook()==1,Message::getIsBook,1); - wrapper.eq(message.getIsMedical()==1,Message::getIsMedical,1); - wrapper.eq(message.getIsSociology()==1,Message::getIsSociology,1); - wrapper.eq(message.getIsPsyche()==1,Message::getIsPsyche,1); + if (message.getIsBook()!=null&&message.getIsBook()==1){ + wrapper.eq(Message::getIsBook,1); + } + if (message.getIsMedical()!=null&&message.getIsMedical()==1){ + wrapper.eq(Message::getIsMedical,1); + } + if (message.getIsSociology()!=null&&message.getIsSociology()==1){ + wrapper.eq(Message::getIsSociology,1); + } + if (message.getIsPsyche()!=null&&message.getIsPsyche()==1){ + wrapper.eq(Message::getIsPsyche,1); + } wrapper.orderByDesc(Message::getCreateTime); List messages = messageService.getBaseMapper().selectList(wrapper); return R.ok().put("messages", messages);