From 8dfbfa7d862ebbd1939090454fae32076603bd71 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 11 Nov 2024 15:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=85=8D=E7=BD=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=20=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/master/controller/BuyConfigController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java b/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java index 545bb2c6..b52687bc 100644 --- a/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java +++ b/src/main/java/com/peanut/modules/master/controller/BuyConfigController.java @@ -31,11 +31,12 @@ public class BuyConfigController { @RequestMapping("/getBookBuyConfigList") public R getBookBuyConfigList(@RequestBody Map params) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); - wrapper.and(t->t.eq(BookBuyConfigEntity::getEffective,0) - .or(q->q.le(BookBuyConfigEntity::getStartTime,new Date()).ge(BookBuyConfigEntity::getEndTime,new Date()))); if (StringUtils.isNotEmpty(params.get("qudao").toString())) { wrapper.eq(BookBuyConfigEntity::getQudao,params.get("qudao")); } + if (params.containsKey("type")&&StringUtils.isNotEmpty(params.get("type").toString())){ + wrapper.eq(BookBuyConfigEntity::getType,params.get("type")); + } Page page = bookBuyConfigService.page(new Page<>( Long.parseLong(params.get("page").toString()), Long.parseLong(params.get("limit").toString())), wrapper); return R.ok().put("result", page);