From 830b0b484f8a918cb376f944a45c6fb7a936bbea Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 12 Mar 2025 09:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/pojo/req/AccessLogQueryDTO.java | 2 +- .../serviceimpl/UserAccessLogServiceImpl.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java index c900fb4..deec5d7 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java @@ -11,6 +11,6 @@ public class AccessLogQueryDTO { private int pageSize; - private String keyword; + private String keyWord; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java index 79c87ef..474f5ff 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java @@ -46,18 +46,18 @@ public class UserAccessLogServiceImpl extends ServiceImpl qr.like(UserAccessLog::getAction, pars.getKeyword()) + if (StrUtil.isNotEmpty(pars.getKeyWord())) { + queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyWord()) .or() - .like(UserAccessLog::getRequestUrl, pars.getKeyword()) + .like(UserAccessLog::getRequestUrl, pars.getKeyWord()) .or() - .like(UserAccessLog::getRequestIp, pars.getKeyword()) + .like(UserAccessLog::getRequestIp, pars.getKeyWord()) .or() - .like(UserAccessLog::getRemoteAddr, pars.getKeyword()) + .like(UserAccessLog::getRemoteAddr, pars.getKeyWord()) .or() - .like(UserAccessLog::getOperationMsg, pars.getKeyword()) + .like(UserAccessLog::getOperationMsg, pars.getKeyWord()) .or() - .like(UserAccessLog::getOperationModule, pars.getKeyword())); + .like(UserAccessLog::getOperationModule, pars.getKeyWord())); } Page logs = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);