FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Complete core functions #9

Merged
FatttSnake merged 171 commits from FatttSnake into dev 2024-02-23 11:56:35 +08:00
Conversation 0 Commits 171 Files Changed 381 +2 -5
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41a9cecdf5 - Show all commits

5
src/main/kotlin/top/fatweb/oxygen/api/service/system/impl/SysLogServiceImpl.kt
View File

@@ -45,10 +45,7 @@ class SysLogServiceImpl(
sysLogGetParam?.searchStartTime, sysLogGetParam?.searchStartTime,
sysLogGetParam?.searchEndTime sysLogGetParam?.searchEndTime
) )
sysLogIPage.records.forEach {
it.operateUsername =
it.operateUserId?.let { it1 -> userService.getOne(it1)?.username }
}
if (sysLogIPage.records.isNotEmpty()) { if (sysLogIPage.records.isNotEmpty()) {
val userIds = sysLogIPage.records.map { it.operateUserId } val userIds = sysLogIPage.records.map { it.operateUserId }

2
src/main/resources/mapper/system/SysLogMapper.xml
View File

@@ -30,7 +30,7 @@
<if test="searchRequestUrl != null"> <if test="searchRequestUrl != null">
and t_sys_log.request_server_address || t_sys_log.request_uri || 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 case when length(t_sys_log.request_params) != 0 then '?' || t_sys_log.request_params else '' end like
'%'||'mail'||'%' '%'||#{searchRequestUrl}||'%'
</if> </if>
<if test="searchStartTime != null and searchEndTime != null"> <if test="searchStartTime != null and searchEndTime != null">
and t_sys_log.start_time between #{searchStartTime} and #{searchEndTime} and t_sys_log.start_time between #{searchStartTime} and #{searchEndTime}