登录日志bug

src/main/java/com/chinaitop/depot/system/model/UserLoginLogVO.java

@@ -18,7 +18,12 @@ public class UserLoginLogVO {
     @ExcelProperty(value = "系统名称")
     @ColumnWidth(30)
     private String xtmc;
-	
+
+    // 机构名称
+    @ExcelProperty(value = "组织")
+    @ColumnWidth(30)
+    private String orgName;
+
     // 访问用户账号
     @ExcelProperty(value = "访问用户账号")
     private String userName;
@@ -38,9 +43,4 @@ public class UserLoginLogVO {
     // 注销时间
     @ExcelProperty(value = "注销时间")
     private Date outLoginTime;
-
-    // 机构名称
-    @ExcelProperty(value = "粮库名称")
-    @ColumnWidth(30)
-    private String orgName;
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserLoginLogServiceImpl.java

@@ -1,35 +1,37 @@
 package com.chinaitop.depot.system.service.impl;
 
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.chinaitop.depot.common.CommonObject;
-import com.chinaitop.depot.system.model.UserInfo;
 import com.chinaitop.depot.system.mapper.UserLoginLogMapper;
+import com.chinaitop.depot.system.model.UserInfo;
 import com.chinaitop.depot.system.model.UserLoginLog;
 import com.chinaitop.depot.system.model.UserLoginLogExample;
 import com.chinaitop.depot.system.model.UserLoginLogVO;
 import com.chinaitop.depot.system.param.UserLoginLogPageParam;
 import com.chinaitop.depot.system.service.UserLoginLogService;
-import com.chinaitop.depot.utils.DateUtils;
 import com.chinaitop.depot.utils.IPUtil;
 import com.chinaitop.depot.utils.RedisUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author qingsong.han
@@ -126,6 +128,8 @@ public class UserLoginLogServiceImpl implements UserLoginLogService {
         if (StringUtils.hasText(param.getRealName())) {
             criteria.andRealNameLike(param.getRealName());
         }
+        //排序
+        example.setOrderByClause("in_login_time desc");
 
         return userLoginLogMapper.selectByExample(example);
     }