From 7335e987b88efe27c38590453ffb36ce2fde88dc Mon Sep 17 00:00:00 2001
From: ShunXing <254874512@qq.com>
Date: Thu, 3 Aug 2023 16:35:11 +0800
Subject: [PATCH] =?UTF-8?q?fix-user:=E4=BF=AE=E5=A4=8D=20=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=9D=83=E9=99=90=20=E4=BB=A5=E5=8F=8A=20=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E7=BC=93=E5=AD=98=E7=99=BB=E5=BD=95=E6=97=B6=20?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E8=8F=9C=E5=8D=95=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E7=BC=BA=E5=A4=B1=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login/controller/LoginController.java      |  3 +++
 .../system/login/service/LoginService.java     | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
index 92eda233..251d4390 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
@@ -57,6 +57,9 @@ public class LoginController {
     @GetMapping("/login/getLoginInfo")
     public ResponseDTO<LoginEmployeeDetail> getLoginInfo() {
         LoginEmployeeDetail loginEmployeeDetail = loginService.getLoginUserDetailCache(SmartRequestUtil.getUserId());
+
+        if(loginEmployeeDetail == null) return ResponseDTO.okMsg("登录信息查询有误");
+
         return ResponseDTO.ok(loginEmployeeDetail);
     }
 
diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
index 96489fe0..07615562 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.system.login.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO;
@@ -199,7 +200,22 @@ public class LoginService {
      * @param requestUserId
      */
     public LoginEmployeeDetail getLoginUserDetailCache(Long requestUserId) {
-        return loginUserDetailCache.get(requestUserId);
+        LoginEmployeeDetail loginEmployeeDetail = loginUserDetailCache.get(requestUserId);
+
+        if(ObjectUtil.isNotEmpty(loginEmployeeDetail))return loginEmployeeDetail;
+
+        //获得雇员信息
+        EmployeeEntity employeeEntity = employeeService.getById(requestUserId);
+
+        if(ObjectUtil.isEmpty(employeeEntity))return null;
+
+        //获取员工登录信息
+        loginEmployeeDetail = loadLoginInfo(employeeEntity);
+
+        if(ObjectUtil.isNotEmpty(loginEmployeeDetail))return loginEmployeeDetail;
+
+
+        return null;
     }