From a88db36285d598d658eea1bc60c6193308c929c4 Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Fri, 21 Jan 2022 11:47:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=99=BB=E5=BD=95=E6=97=B6=E9=95=BF=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/api/domain/SysUser.java   | 13 -------------
 .../main/resources/mapper/system/SysUserMapper.xml  |  5 ++---
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index b0619de3..e83e8efa 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -66,12 +66,6 @@ public class SysUser extends BaseEntity
     private Integer loginCount;
 
 
-    /**
-     * 登录总时长
-     */
-    private Long loginTimes;
-
-
     /** 帐号状态（0正常 1停用） */
     @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
@@ -125,13 +119,6 @@ public class SysUser extends BaseEntity
         this.loginCount = loginCount;
     }
 
-    public Long getLoginTimes() {
-        return loginTimes;
-    }
-
-    public void setLoginTimes(Long loginTimes) {
-        this.loginTimes = loginTimes;
-    }
 
     public Long getUserId()
     {
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 0531ac5e..1b9f8a5c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -15,9 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="avatar"       column="avatar"       />
 		<result property="password"     column="password"     />
 
-		<!--2022-01-21新增字段用来统计登录次数和时长(Author:xjs)-->
+		<!--2022-01-21新增字段用来统计登录次数(Author:xjs)-->
 		<result property="loginCount"     column="login_count"     />
-		<result property="loginTimes"     column="login_times"     />
 
 		<result property="status"       column="status"       />
 		<result property="delFlag"      column="del_flag"     />
@@ -51,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectUserVo">
-        select u.login_count,  u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
+        select u.login_count, u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u