From 5cc05e1820f1ea696f82a01f3718532980fa5494 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 24 Sep 2025 10:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E8=AE=A1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/UserAccessLogServiceImpl.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) 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 afbb7e7..6f2381b 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 @@ -27,10 +27,7 @@ import com.electromagnetic.industry.software.manage.service.UserAccessLogService import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @Service @@ -75,14 +72,22 @@ public class UserAccessLogServiceImpl extends ServiceImpl operationObjSet = new HashSet<>(); + Set userIdSet = userMapper.selectList(Wrappers.lambdaQuery().select(User::getId).like(User::getUserName, pars.getKeyWord())).stream().map(User::getId).collect(Collectors.toSet()); + for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) { + if (e.desc.contains(pars.getKeyWord())){ + operationObjSet.add(e.key); + } + } + queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyWord()) -// .or() -// .like(UserAccessLog::getRequestUrl, pars.getKeyWord()) + .or() + .in(CollUtil.isNotEmpty(operationObjSet), UserAccessLog::getOperationModule, operationObjSet) + .or() + .in(CollUtil.isNotEmpty(userIdSet), UserAccessLog::getUserId, userIdSet) .or() .like(UserAccessLog::getRequestIp, pars.getKeyWord()) .or() - .like(UserAccessLog::getRemoteAddr, pars.getKeyWord()) - .or() .like(UserAccessLog::getOperationMsg, pars.getKeyWord())); }