From 954513ab6d2ee3c78aefca9fc4221bc069931482 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 24 May 2024 16:35:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/controller/MessageController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 params) { LambdaQueryWrapper 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 page = messageService.page(new Page<>(