From 92b3d21d2b7e8cb51dc1a77e8efa4d3bb6d76eae Mon Sep 17 00:00:00 2001
From: qiankunpingtai <qiankunpingtai@163.com>
Date: Thu, 28 Feb 2019 11:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8ie=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E8=BF=94=E5=9B=9E=E7=9A=84user?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=9C=A8=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=98=8E=E7=A1=AE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8Auser=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/controller/UserController.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java
index 46260d9c..117a7765 100644
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -36,6 +36,7 @@ public class UserController {
                         HttpServletRequest request) {
         logger.info("============用户登录 login 方法调用开始==============");
         String msgTip = "";
+        User user=null;
         BaseResponseInfo res = new BaseResponseInfo();
         try {
             String username = loginame.trim();
@@ -81,7 +82,7 @@ public class UserController {
                 default:
                     try {
                         //验证通过 ，可以登录，放入session，记录登录日志
-                        User user = userService.getUserByUserName(username);
+                        user = userService.getUserByUserName(username);
     //                    logService.create(new Logdetails(user, "登录系统", model.getClientIp(),
     //                            new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
                         msgTip = "user can login";
@@ -93,6 +94,13 @@ public class UserController {
             }
             Map<String, Object> data = new HashMap<String, Object>();
             data.put("msgTip", msgTip);
+            /**
+             * 在IE模式下，无法获取到user数据，
+             * 在此处明确添加上user信息
+             * */
+            if(user!=null){
+                data.put("user",user);
+            }
             res.code = 200;
             res.data = data;
             logger.info("===============用户登录 login 方法调用结束===============");