From 5b207a55bdd10f1516031f629217daac069b64fd Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期五, 30 八月 2024 11:40:31 +0800
Subject: [PATCH] 添加免登录查询所有排班接口;
---
pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
index 5c0e8fb..1c2b4b8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaLogMapper.xml
@@ -39,19 +39,19 @@
<if test="userId != null">
user_id,
</if>
- <if test="userName != null">
+ <if test="userName != null and userName !=''">
user_name,
</if>
- <if test="content != null">
+ <if test="content != null and content !=''">
content,
</if>
- <if test="code != null">
+ <if test="code != null and code !=''">
code,
</if>
- <if test="msg != null">
+ <if test="msg != null and msg !=''">
msg,
</if>
- <if test="ip != null">
+ <if test="ip != null and ip !=''">
ip,
</if>
</trim>
@@ -59,19 +59,19 @@
<if test="userId != null">
#{userId,jdbcType=BIGINT},
</if>
- <if test="userName != null">
+ <if test="userName != null and userName !=''">
#{userName,jdbcType=VARCHAR},
</if>
- <if test="content != null">
+ <if test="content != null and content !=''">
#{content,jdbcType=VARCHAR},
</if>
- <if test="code != null">
+ <if test="code != null and code !=''">
#{code,jdbcType=VARCHAR},
</if>
- <if test="msg != null">
+ <if test="msg != null and msg !=''">
#{msg,jdbcType=VARCHAR},
</if>
- <if test="ip != null">
+ <if test="ip != null and ip !=''">
#{ip,jdbcType=VARCHAR},
</if>
</trim>
@@ -79,12 +79,10 @@
<select id="selectSome" resultMap="BaseResultMap">
select
- <include refid="Base_Column_List" >
- <property name="alias" value="r"/>
- </include>
+ <include refid="Base_Column_List" />
from ba_log r
<trim prefix="where " suffixOverrides="and">
- <if test="userId != null and userId != ''">
+ <if test="userId != null">
user_id = #{userId,jdbcType=BIGINT} and
</if>
<if test="userName != null and userName != ''">
@@ -94,7 +92,7 @@
content like concat('%', #{content}, '%') and
</if>
<if test="dt != null and dt != '' ">
- dt = #{dt,jdbcType=TIMESTAMP} and
+ DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="ip != null and ip != '' ">
ip =#{ip,jdbcType=VARCHAR} and
@@ -112,7 +110,7 @@
select count(1)
from ba_log r
<trim prefix="where " suffixOverrides="and">
- <if test="userId != null and userId != ''">
+ <if test="userId != null">
user_id = #{userId,jdbcType=BIGINT} and
</if>
<if test="userName != null and userName != ''">
@@ -122,7 +120,7 @@
content like concat('%', #{content}, '%') and
</if>
<if test="dt != null and dt != '' ">
- dt = #{dt,jdbcType=TIMESTAMP} and
+ DATE_FORMAT(dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
</if>
<if test="ip != null and ip != '' ">
ip =#{ip,jdbcType=VARCHAR} and
--
Gitblit v1.8.0