浏览代码

Squashed commit of the following:

commit 931739930c630f45303ac461a32dab42cde3abf0
Author: ting.yin <yinting@qmth.com.cn>
Date:   Thu Dec 31 17:12:51 2020 +0800

    修复从未登录的评卷员登录问题

commit 7ae80de6e26dd30068fd4707f2d043ded43367cc
Author: ting.yin <yinting@qmth.com.cn>
Date:   Tue Dec 29 10:40:03 2020 +0800

    fix

commit 78bf818447514bae1132fdd13c17709554442fd1
Author: ting.yin <yinting@qmth.com.cn>
Date:   Tue Dec 29 09:51:43 2020 +0800

    修复试评显示

commit 53d0b6052db8144b9a6104a4bcd8b66d1254972e
Author: ting.yin <yinting@qmth.com.cn>
Date:   Tue Dec 29 09:45:17 2020 +0800

    修复登录错误提示信息显示问题

commit d5c768283b27cc5b36e423fc0d47829ed9a4774a
Author: ting.yin <yinting@qmth.com.cn>
Date:   Mon Dec 28 18:03:27 2020 +0800

    修复mark-login登录问题,评卷员退出统一跳转mark-login页面
luoshi 4 年之前
父节点
当前提交
e25200885f
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

+ 2 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -103,7 +103,7 @@ public class LoginController {
             if (u.getLastLoginTime() == null) {
             if (u.getLastLoginTime() == null) {
                 u.refreshAccessToken();
                 u.refreshAccessToken();
                 userService.save(u);
                 userService.save(u);
-                WebUser wu = new WebUser(user);
+                WebUser wu = new WebUser(u);
                 wu.setLogoutUrl(MARK_LOGIN);
                 wu.setLogoutUrl(MARK_LOGIN);
                 session.saveWebUser(wu);
                 session.saveWebUser(wu);
                 sessionService.put(request, response, session);
                 sessionService.put(request, response, session);
@@ -158,7 +158,7 @@ public class LoginController {
         if (u.getLastLoginTime() == null) {
         if (u.getLastLoginTime() == null) {
             u.refreshAccessToken();
             u.refreshAccessToken();
             userService.save(u);
             userService.save(u);
-            WebUser wu = new WebUser(user);
+            WebUser wu = new WebUser(u);
             wu.setLogoutUrl(MARK_LOGIN);
             wu.setLogoutUrl(MARK_LOGIN);
             session.saveWebUser(wu);
             session.saveWebUser(wu);
             sessionService.put(request, response, session);
             sessionService.put(request, response, session);