From c7cef19248eb9bb6a5420a48d1b26167ff7db858 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 27 六月 2024 17:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
index 9467793..3cd9c93 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/LoginController.java
@@ -307,9 +307,9 @@
@ResponseBody
public BaseResult getSessionInfo(){
BaseResult<SessionInfo> json = new BaseResult<>();
- json.setObj(WebThreadLocalUtil.getCurrentUserSessionInfoInThread());
- if(json.getObj()!=null){
- json.setSuccess(true);
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ if(sessionInfo != null){
+ json = json.success(sessionInfo);
}
return json;
}
--
Gitblit v1.9.3