test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 操作日志点击重置按钮报错 

--bug=1013872 --user=李玉号 【系统设置】操作日志点击重置按钮 报错
https://www.tapd.cn/55049933/s/1176201
This commit is contained in:
shiziyuan9527 2022-06-08 14:32:46 +08:00 committed by f2c-ci-robot[bot]
parent fb9ec01c6f
commit 7dd03eace9
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtOperatingLogMapper.xml
View File

@ -23,7 +23,6 @@
LEFT JOIN workspace w on t2.workspace_id = w.id LEFT JOIN workspace w on t2.workspace_id = w.id
LEFT JOIN operating_log_resource t3 ON t.id = t3.operating_log_id LEFT JOIN operating_log_resource t3 ON t.id = t3.operating_log_id
<where> <where>
(
<if test="request.projectIds != null and request.projectIds.size > 0 "> <if test="request.projectIds != null and request.projectIds.size > 0 ">
t.project_id in t.project_id in
<foreach collection="request.projectIds" item="projectId" separator="," open="(" close=")"> <foreach collection="request.projectIds" item="projectId" separator="," open="(" close=")">
@ -40,7 +39,6 @@
or t.project_id is null or t.project_id is null
or t.project_id = "" or t.project_id = ""
</if> </if>
)
<if test="request.operUser != null and request.operUser != ''"> <if test="request.operUser != null and request.operUser != ''">
and (t.oper_user like #{request.operUser, jdbcType=VARCHAR} or t1.name like and (t.oper_user like #{request.operUser, jdbcType=VARCHAR} or t1.name like
#{request.operUser, jdbcType=VARCHAR}) #{request.operUser, jdbcType=VARCHAR})