From 4b0aa2f64d51cda51612a75a19a7057b3007ac79 Mon Sep 17 00:00:00 2001 From: yangchaoshun <2919058172@qq.com> Date: Mon, 24 Feb 2025 12:28:10 +0800 Subject: [PATCH] =?UTF-8?q?fit():=E4=BF=AE=E6=94=B9SysLoginfor=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=BAddd=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/system/service/impl/SysLogininforServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index a5bd0c4..fea5959 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -50,12 +50,11 @@ public class SysLogininforServiceImpl extends ServiceImpl pageQuery(SysLogininforListModel pageQueryModel) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + Page page = this.page(pageQueryModel.buildPage(), new LambdaQueryWrapper() .like(StringUtils.isNotEmpty(pageQueryModel.getIpaddr()), SysLogininfor::getIpaddr, pageQueryModel.getIpaddr()) .eq(StringUtils.isNotEmpty(pageQueryModel.getStatus()), SysLogininfor::getStatus, pageQueryModel.getStatus()) .like(StringUtils.isNotEmpty(pageQueryModel.getUserName()), SysLogininfor::getUserName, pageQueryModel.getUserName()) - .between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime()); - Page page = this.page(pageQueryModel.buildPage(), queryWrapper); + .between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime())); return new PageQueryModel(){{ setDataList(page.getRecords().stream() .map(SysLogininforListModel::buildSysLogininforListModel)