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 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; }