From adb2f4594760ff2b18e83b8cff5c4ce99dfdff45 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 16:01:05 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
index c26d0af..1f5a1fd 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminLoginLogMapper.xml
@@ -13,7 +13,8 @@
</resultMap>
<select id="selectByCondition" parameterType="com.ycl.dto.log.LogQueryParams"
resultType="com.ycl.entity.user.vo.UmsAdminLogVO">
- SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1 left join ums_admin t2 on t1.admin_id=t2.id
+ SELECT t1.*,t2.username as adminId FROM ums_admin_login_log t1
+ left join ums_admin t2 on t1.admin_id=t2.id
<where>
<if test="logQueryParams.content!='' and logQueryParams.content!=null">
contain LIKE CONCAT('%',#{logQueryParams.content},'%')
@@ -24,10 +25,10 @@
<if test="logQueryParams.portEquipment!='' and logQueryParams.portEquipment!=null">
and user_agent=#{logQueryParams.portEquipment}
</if>
- <if test="logQueryParams.id!=null">
+ <if test="logQueryParams.id != null">
and admin_id=#{logQueryParams.id}
</if>
- <if test="logQueryParams.startTime!='' and logQueryParams.endTime!=''">
+ <if test="logQueryParams.startTime != '' and logQueryParams.endTime !='' and logQueryParams.startTime !=null and logQueryParams.endTime!=null ">
and create_time BETWEEN #{logQueryParams.startTime} AND #{logQueryParams.endTime}
</if>
</where>
--
Gitblit v1.8.0