diff --git a/src/main/java/com/yipin/liuwanr/entity/UserInfo.java b/src/main/java/com/yipin/liuwanr/entity/UserInfo.java index f56be07..6949a8c 100644 --- a/src/main/java/com/yipin/liuwanr/entity/UserInfo.java +++ b/src/main/java/com/yipin/liuwanr/entity/UserInfo.java @@ -99,4 +99,6 @@ public class UserInfo { private String twoDepartmentName; //组织架构id private Integer organizationRelationshipId; + //登陆时间 + private String dataTime; } diff --git a/src/main/java/com/yipin/liuwanr/service/UserInfoService.java b/src/main/java/com/yipin/liuwanr/service/UserInfoService.java index 21bc901..214c5b9 100644 --- a/src/main/java/com/yipin/liuwanr/service/UserInfoService.java +++ b/src/main/java/com/yipin/liuwanr/service/UserInfoService.java @@ -440,12 +440,13 @@ public class UserInfoService { String roleId = userInfo.getRoleId(); Integer schoolId = userInfo.getSchoolId(); try { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 + String date = df.format(new Date());// new Date()为获取当前系统时间,也可使用当前时间戳 UserInfo user=userInfoMapper.logins(userInfo); String token = user.getToken(); Integer userId = user.getUserId(); + user.setDataTime(date); obj.put("user",user); - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 - String date = df.format(new Date());// new Date()为获取当前系统时间,也可使用当前时间戳 if(id!=null) { List staffList = userInfoMapper.queryStaffAll(id,roleId,schoolId); obj.put("staffList",staffList);