登录返回用户名

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -23,6 +23,10 @@ public class SysLogininfor extends BaseEntity
     @Excel(name = "用户账号")
     private String userName;
 
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String nickName;
+
     /** 登录状态 0成功 1失败 */
     @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
     private String status;
@@ -72,6 +76,16 @@ public class SysLogininfor extends BaseEntity
         this.userName = userName;
     }
 
+    public String getNickName()
+    {
+        return nickName;
+    }
+
+    public void setNickName(String nickName)
+    {
+        this.nickName = nickName;
+    }
+
     public String getStatus()
     {
         return status;

oa-back/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<resultMap type="SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />
 		<result property="userName"      column="user_name"         />
+		<result property="nickName"      column="nick_name"         />
 		<result property="status"        column="status"            />
 		<result property="ipaddr"        column="ipaddr"            />
 		<result property="loginLocation" column="login_location"    />
@@ -22,25 +23,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</insert>
 	
 	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
-		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
+		select l.info_id, l.user_name, l.ipaddr, l.login_location, l.browser, l.os, l.status, l.msg, l.login_time, u.nick_name from sys_logininfor as l
+		left join sys_user as u on u.user_name = l.user_name
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
-				AND ipaddr like concat('%', #{ipaddr}, '%')
+				AND l.ipaddr like concat('%', #{ipaddr}, '%')
 			</if>
 			<if test="status != null and status != ''">
-				AND status = #{status}
+				AND l.status = #{status}
 			</if>
 			<if test="userName != null and userName != ''">
-				AND user_name like concat('%', #{userName}, '%')
+				AND l.user_name like concat('%', #{userName}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND login_time &gt;= #{params.beginTime}
+				AND l.login_time &gt;= #{params.beginTime}
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND login_time &lt;= #{params.endTime}
+				AND l.login_time &lt;= #{params.endTime}
 			</if>
 		</where>
-		order by info_id desc
+		order by l.info_id desc
 	</select>
 	
 	<delete id="deleteLogininforByIds" parameterType="Long">

oa-back/sql/sql.sql

@@ -120,7 +120,7 @@ INSERT INTO `sys_user` VALUES (18, 104, '15181125323', '简鑫', '0', NULL, '151
 INSERT INTO `sys_user` VALUES (19, 104, '13378256139', '谢辉波', '0', NULL, '13378256139', '0', NULL, '$2a$10$PJ4LqpBpny216Si34DlKPeIkoFP5xdvL/SBLB4v5eozd18VfNL5mm', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '13', NULL, NULL, '0', '1', NULL, '2023-04-17', NULL, NULL, NULL, '510522199901164130', '四川省泸州市', '9', '汉族', '成都文理学院', '休闲体育', '2', '2023-04-17', '2024-04-16', '四川省成都市青羊区府南街道战旗东路战旗社区9号院');
 INSERT INTO `sys_user` VALUES (20, 105, '13550342375', '李胜才', '0', NULL, '13550342375', '0', NULL, '$2a$10$q7BJ2CI/X/AL3hseBTm7Z.CCtvLr.NeI/OwZOICdtxd13RznKX.HK', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '1', NULL, NULL, '4', '5', NULL, '1996-07-29', NULL, NULL, NULL, '420111197511044131', '吉林省长春市', '9', '汉族', '武汉大学', '测绘工程', '2', '2016-01-01', NULL, '四川省成都市温江区海科路东段519号水韵尚城3栋2单元1403号');
 INSERT INTO `sys_user` VALUES (21, 105, '13568885428', '杨俊', '0', NULL, '13568885428', '0', NULL, '$2a$10$yW3z4U6JdMGo3n6poXtruu16VL.KcDXKl41Pz/xdHTQo4dTEfvjlK', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '2', NULL, NULL, '4', '4', NULL, '2011-07-05', NULL, NULL, NULL, '511623198911083017', '四川省广安市', '13', '汉族', '四川大学', '土木工程', '2', '2015-07-05', NULL, '成都市温江区共和路800号恒大未来城1期7栋3002');
-INSERT INTO `sys_user` VALUES (22, 105, '13882200825', '夏夏', '0', NULL, '13882200825', '0', NULL, '$2a$10$oahcLiTjDkt6kH/89FuyOOAVtngZOq61XBFNQ75tH1f4fA1p0y4yu', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '2', NULL, NULL, '3', '5', NULL, '2005-05-01', NULL, NULL, NULL, '420502198101064826', '湖北省宜昌市', '13', '汉族', '国家开放大学', '计算机科学与技术', '2', '2016-01-01', NULL, '成都市青羊区小南街69号长城园 3栋3单元3302号');
+INSERT INTO `sys_user` VALUES (22, 105, '13882200825', '夏夏', '0', NULL, '13882200825', '1', NULL, '$2a$10$oahcLiTjDkt6kH/89FuyOOAVtngZOq61XBFNQ75tH1f4fA1p0y4yu', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '2', NULL, NULL, '3', '5', NULL, '2005-05-01', NULL, NULL, NULL, '420502198101064826', '湖北省宜昌市', '13', '汉族', '国家开放大学', '计算机科学与技术', '2', '2016-01-01', NULL, '成都市青羊区小南街69号长城园 3栋3单元3302号');
 INSERT INTO `sys_user` VALUES (23, 105, '18373705527', '柯枭', '0', NULL, '18373705527', '1', NULL, '$2a$10$087ftY2N01MRLXtnmbiFi.5BkERRdJjhgN2dvK.9NKLGaUW5Ng8je', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '2', NULL, NULL, '3', '3', NULL, '2018-06-10', NULL, NULL, NULL, '511325199401115446', '新疆阿克苏市', '7', '汉族', '湖南城市学院', '测绘工程', '2', '2022-06-10', NULL, '成都市温江区星光华印象');
 INSERT INTO `sys_user` VALUES (24, 105, '18202833529', '黎超', '0', NULL, '18202833529', '0', NULL, '$2a$10$XpcXQUUnBGUEy69FOaxIfuUBelPd2WdrdcQ15BacdyD5/0Vg0xeY.', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '2', NULL, NULL, '3', '3', NULL, '2020-01-30', NULL, NULL, NULL, '510131199008082719', '四川省蒲江县', '13', '汉族', '西南科技大学', '采矿工程', '2', '2021-01-30', '2024-01-29', '成都市温江区江安路199号千禧河畔A区');
 INSERT INTO `sys_user` VALUES (25, 105, '13111885671', '刘兴', '0', NULL, '13111885671', '0', NULL, '$2a$10$IKwUUqIkWmYEZj876F9r8elhBg3Rk4z9Qipc11gCn9Uo90nF5ekhi', '0', '0', NULL, NULL, NULL, '2024-05-14 10:41:32', NULL, '2024-07-17 09:29:39', NULL, NULL, '13', NULL, NULL, '1', '0', NULL, '2021-03-22', NULL, NULL, NULL, '513822199803237198', '四川省仁寿县', '12', '汉族', '四川城市职业学院', '工程测量技术', '3', '2022-03-22', '2025-03-21', '成都市龙泉驿区西河镇慧生时代广场');