From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index faaee57..cc568e7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -92,21 +92,6 @@
sol.oper_time AS operTime, sol.cost_time AS costTime,sol.companyName AS companyName,sol.roleName AS roleName,sol.phonenumber AS phonenumber,
sol.userId AS userId,sol.nickName AS nickName
from sys_oper_log sol
- <where>
- <if test="query.companyName != null and query.companyName != ''">
- AND sol.companyName LIKE concat('%',#{query.companyName},'%')
- </if>
- <if test="query.roleName != null and query.roleName != ''">
- AND sol.roleName LIKE concat('%',#{query.roleName},'%')
- </if>
- <if test="query.nickName != null and query.nickName != ''">
- AND sol.nickName LIKE concat('%',#{query.nickName},'%')
- </if>
- <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
- AND DATE_FORMAT(sol.oper_time, '%Y-%m-%d %H:%i:%s') >= #{query.startTime}
- AND DATE_FORMAT(sol.oper_time, '%Y-%m-%d %H:%i:%s') <= #{query.endTime}
- </if>
- </where>
ORDER BY sol.oper_time DESC
</select>
--
Gitblit v1.7.1