diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java
index 09b7897..6c4c3d6 100644
--- a/power-admin/src/main/java/com/manage/controller/FontController.java
+++ b/power-admin/src/main/java/com/manage/controller/FontController.java
@@ -11,6 +11,7 @@ import com.manage.service.cache.Cache;
 import com.manage.service.cache.CacheManager;
 import com.manage.service.ipml.Power_NoticeServiceImpl;
 import com.manage.service.webSocket.WsPool;
+import com.manage.util.ActionScopeUtils;
 import com.manage.util.DateUtils;
 import com.manage.util.ExceptionPrintUtil;
 import com.manage.util.Msg;
@@ -579,6 +580,7 @@ public class FontController {
         //移除缓存
         CacheManager.removeCacheByObject(userVo);
         CacheManager.putCache(date,new Cache(date,userVo,TOKEN_EXPIRE_TIME));
+        ActionScopeUtils.setSessionAttribute("CURRENT_USER",userVo,Integer.valueOf(String.valueOf(TOKEN_EXPIRE_TIME))/1000);
         return token;
     }
 
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 64866ae..625fab4 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -43,7 +43,7 @@
     delete from power_user
     where user_id = #{userId,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.manage.entity.Power_User">
+  <insert id="insert" parameterType="com.manage.entity.Power_User" useGeneratedKeys="true" keyProperty="userId">
     insert into power_user (user_id, user_name,name, user_pwd,
       user_sex, user_age, user_tel, 
       user_email, user_position, role_id, 
@@ -265,7 +265,7 @@
   <!--2019-07-31 zengwenhe -->
   <select id="checkUserName"  resultMap="BaseResultMap"  parameterType="java.lang.String">
     SELECT
-        user_id,role_id,dept_id
+        *
     FROM
         power_user
     WHERE