From cffce178a3f584595219034cd700944992870f98 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Thu, 25 Jan 2024 10:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/SysLogininforMapper.xml     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml
index 2355ec64..160ae5fc 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -19,25 +19,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="com.bonus.sgzb.system.api.domain.SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor
-		<where>
+		select sl.info_id, sl.user_name, su.nick_name, sl.ipaddr, sl.status, sl.msg, sl.access_time
+		from sys_logininfor as sl left join sys_user as su
+		on sl.user_name = su.user_name
+		    WHERE 1=1
 			<if test="ipaddr != null and ipaddr != ''">
-				AND ipaddr like concat('%', #{ipaddr}, '%')
+				AND sl.ipaddr like concat('%', #{ipaddr}, '%')
 			</if>
 			<if test="status != null and status != ''">
-				AND status = #{status}
+				AND sl.status = #{status}
 			</if>
 			<if test="userName != null and userName != ''">
-				AND user_name like concat('%', #{userName}, '%')
+				AND sl.user_name like concat('%', #{userName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND access_time &gt;= #{params.beginTime}
+				AND sl.access_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND access_time &lt;= #{params.endTime}
+				AND sl.access_time &lt;= #{params.endTime}
 			</if>
-		</where>
-		order by info_id desc
+		order by sl.info_id desc
 	</select>
 	
 	<delete id="deleteLogininforByIds" parameterType="Long">