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);