diff --git a/src/main/java/com/lovenav/controller/LoginLogsController.java b/src/main/java/com/lovenav/controller/LoginLogsController.java
index 2d92cf7..155356d 100644
--- a/src/main/java/com/lovenav/controller/LoginLogsController.java
+++ b/src/main/java/com/lovenav/controller/LoginLogsController.java
@@ -17,7 +17,6 @@ public class LoginLogsController {
     LoginLogsService loginLogsService;
     @RequestMapping("/getUserLoginLogs")
     public List<LoginLogs> getUserLoginLog(LoginLogs loginLogs){
-
         if (loginLogs==null){
             return null;
         }
diff --git a/src/main/java/com/lovenav/controller/UserController.java b/src/main/java/com/lovenav/controller/UserController.java
index dc891c7..8f323a4 100644
--- a/src/main/java/com/lovenav/controller/UserController.java
+++ b/src/main/java/com/lovenav/controller/UserController.java
@@ -26,6 +26,7 @@ import javax.websocket.Session;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -192,7 +193,7 @@ public class UserController {
 
     }
     @RequestMapping("/getAllUsers")
-    public HashMap<Integer,Object> getAllUsers(){
+    public List<User> getAllUsers(){
         return  userService.getAllUsers();
     }
 
@@ -227,4 +228,11 @@ public class UserController {
 //        }
 //        return userService.updateUserMessage(user);
 //    }
+    @RequestMapping("/getUserDetailes")
+    public User getUserDetailes(User user){
+        if (user==null||user.getId()==null){
+            return null;
+        }
+       return userService.selectByUserId(user);
+    }
 }
diff --git a/src/main/java/com/lovenav/dao/UserDao.java b/src/main/java/com/lovenav/dao/UserDao.java
index 2ec1836..4570f99 100644
--- a/src/main/java/com/lovenav/dao/UserDao.java
+++ b/src/main/java/com/lovenav/dao/UserDao.java
@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.HashMap;
+import java.util.List;
 
 @Mapper
 @Repository
@@ -28,8 +29,8 @@ public interface UserDao {
     User selectByUserLogin(String user_login);
 
     int updateByEmail(User user);
-    @MapKey("id")
-    HashMap<Integer,Object> selectAllUsers();
+
+    List<User> selectAllUsers();
 
 
     /**
diff --git a/src/main/java/com/lovenav/service/UserService.java b/src/main/java/com/lovenav/service/UserService.java
index b9a6645..b3747a7 100644
--- a/src/main/java/com/lovenav/service/UserService.java
+++ b/src/main/java/com/lovenav/service/UserService.java
@@ -3,6 +3,7 @@ package com.lovenav.service;
 import com.lovenav.entity.User;
 
 import java.util.HashMap;
+import java.util.List;
 
 
 public interface UserService {
@@ -16,7 +17,7 @@ public interface UserService {
 
     public int updatePassword(User user);
 
-    HashMap<Integer,Object> getAllUsers();
+    List<User> getAllUsers();
 
     String updateUserMessage(User user);
 
@@ -24,4 +25,5 @@ public interface UserService {
 
     public User selectByUserId(User user);
 
+
 }
diff --git a/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java b/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java
index d3499cd..70c3edb 100644
--- a/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/lovenav/service/serviceImpl/UserServiceImpl.java
@@ -13,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.regex.Pattern;
 
 
@@ -60,10 +61,9 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public HashMap<Integer, Object> getAllUsers() {
-        HashMap<Integer, Object> map=new HashMap<>();
-        map=userDao.selectAllUsers();
-        return map;
+    public List<User> getAllUsers() {
+
+        return userDao.selectAllUsers();
     }
 
     @Override
diff --git a/src/main/resources/mybatis/LoginLogsDao.xml b/src/main/resources/mybatis/LoginLogsDao.xml
index 2a23404..c7ca83d 100644
--- a/src/main/resources/mybatis/LoginLogsDao.xml
+++ b/src/main/resources/mybatis/LoginLogsDao.xml
@@ -17,18 +17,17 @@
     from ln_login_logs
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <select id="selectAlreadyExist" resultType="com.lovenav.entity.LoginLogs">
+  <select id="selectAlreadyExist" resultMap="BaseResultMap" parameterType="java.lang.Integer">
     select
     <include refid="Base_Column_List" />
     from ln_login_logs
     where user_id = #{userId,jdbcType=INTEGER}
   </select>
-    <select id="getLoginLogs" resultType="com.lovenav.entity.LoginLogs">
+    <select id="getLoginLogs" resultMap="BaseResultMap" parameterType="java.lang.Integer">
       select
       <include refid="Base_Column_List" />
       from ln_login_logs
       where user_id = #{userId,jdbcType=INTEGER}
-      order by login_time DESC
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from ln_login_logs
diff --git a/src/main/resources/mybatis/UserDao.xml b/src/main/resources/mybatis/UserDao.xml
index b13b87e..ad4c0fe 100644
--- a/src/main/resources/mybatis/UserDao.xml
+++ b/src/main/resources/mybatis/UserDao.xml
@@ -190,7 +190,7 @@
     from ln_user
     where user_login = #{user_login,jdbcType=VARCHAR}
   </select>
-    <select id="selectAllUsers" resultType="java.util.HashMap">
+    <select id="selectAllUsers" resultMap="BaseResultMap" >
       select
       <include refid="Base_Column_List" />
       from ln_user