From 41a9cecdf550d81cc529432cf7eb7230bbe5964f Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 2 Jan 2024 17:20:49 +0800 Subject: [PATCH] Fix system log can not search bug --- .../oxygen/api/service/system/impl/SysLogServiceImpl.kt | 5 +---- src/main/resources/mapper/system/SysLogMapper.xml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt index 2ad005f..709c560 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt @@ -45,10 +45,7 @@ class SysLogServiceImpl( sysLogGetParam?.searchStartTime, sysLogGetParam?.searchEndTime ) - sysLogIPage.records.forEach { - it.operateUsername = - it.operateUserId?.let { it1 -> userService.getOne(it1)?.username } - } + if (sysLogIPage.records.isNotEmpty()) { val userIds = sysLogIPage.records.map { it.operateUserId } diff --git a/src/main/resources/mapper/system/SysLogMapper.xml b/src/main/resources/mapper/system/SysLogMapper.xml index 1b37cf6..99c568f 100644 --- a/src/main/resources/mapper/system/SysLogMapper.xml +++ b/src/main/resources/mapper/system/SysLogMapper.xml @@ -30,7 +30,7 @@ and t_sys_log.request_server_address || t_sys_log.request_uri || case when length(t_sys_log.request_params) != 0 then '?' || t_sys_log.request_params else '' end like - '%'||'mail'||'%' + '%'||#{searchRequestUrl}||'%' and t_sys_log.start_time between #{searchStartTime} and #{searchEndTime}