From 37f41a7c17d81a60092e9d69363905f21d9b1a49 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 19 三月 2024 17:34:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
index c357e57..8374785 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckRuleServiceImpl.java
@@ -107,12 +107,13 @@
@Override
public Result page(CheckRuleQuery query) {
- IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper)
+ IPage<CheckRule> page = new LambdaQueryChainWrapper<>(baseMapper)
.like(StringUtils.hasText(query.getRuleName()), CheckRule::getRuleName, query.getRuleName())
.between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
CheckRule::getCreateTime,
DateUtils.getDayStart(query.getStart()),
DateUtils.getDayEnd(query.getEnd()))
+ .eq(Objects.nonNull(query.getAuditState()),CheckRule::getAuditState, query.getAuditState())
.orderByDesc(CheckRule::getCreateTime)
.page(PageUtil.getPage(query, CheckRule.class));
--
Gitblit v1.8.0