From 7aeb2158095fba5eb8ae18b3cf696b6602920505 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 5 Dec 2023 10:39:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug2117=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=BF=87=E6=85=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/system/service/impl/AuditServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java index 2601d2aa9..055c3b190 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java @@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nimbusds.jose.JWSObject; import com.njcn.common.config.GeneralInfo; +import com.njcn.common.pojo.constant.LogInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.SecurityConstants; import com.njcn.common.pojo.dto.UserTokenInfo; import com.njcn.common.pojo.exception.BusinessException; @@ -83,10 +85,16 @@ public class AuditServiceImpl extends ServiceImpl implem List auditLogVOS = new ArrayList<>(); Page info = this.page(new Page<>(auditParam.getPageNum(), auditParam.getPageSize()), new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(auditParam.getLoginName()), UserLog::getLoginName, auditParam.getLoginName()) - .ne(UserLog::getLoginName, "unknown user") + .and(StrUtil.isNotBlank(auditParam.getLoginName()), qw -> + //如果Objects.equals(auditParam.getOperateType(), OperateType.AUTHENTICATE)则是用户登陆信息查询页面，loginname可模糊匹配Ip，CreateTime + qw.like(UserLog::getLoginName, auditParam.getLoginName()).or(Objects.equals(auditParam.getOperateType(), OperateType.AUTHENTICATE)).like( + UserLog::getIp, auditParam.getLoginName() + ).or(Objects.equals(auditParam.getOperateType(), OperateType.AUTHENTICATE)).like( + UserLog::getCreateTime, auditParam.getLoginName() + )) + .ne(UserLog::getLoginName, LogInfo.UNKNOWN_USER) .ne(UserLog::getLoginName, "") - .ne(UserLog::getOperate, "unknown user") + .ne(UserLog::getOperate, LogInfo.UNKNOWN_OPERATE) .eq(auditParam.getType() != null, UserLog::getType, auditParam.getType()) .eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType()) .ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))