From 80478baf76ebb4139f44e73687615216e7b5e338 Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Wed, 17 Apr 2024 11:20:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复对于 token 的解析获取无法获取到 userDO 的情况进行异常返回
---
 .run/oa [clean,spring-boot_run].run.xml                |  4 ++--
 .../java/com/jsl/oa/services/impl/AuthServiceImpl.java | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.run/oa [clean,spring-boot_run].run.xml b/.run/oa [clean,spring-boot_run].run.xml
index febc511..f190190 100644
--- a/.run/oa [clean,spring-boot_run].run.xml	
+++ b/.run/oa [clean,spring-boot_run].run.xml	
@@ -8,14 +8,14 @@
           <option name="environmentProperties">
             <map />
           </option>
-          <option name="jreName" value="corretto-17" />
+          <option name="jreName" value="#USE_PROJECT_JDK" />
           <option name="mavenProperties">
             <map />
           </option>
           <option name="passParentEnv" value="true" />
           <option name="runMavenInBackground" value="true" />
           <option name="skipTests" value="false" />
-          <option name="vmOptions" value="-Dfile.encoding=GB2312" />
+          <option name="vmOptions" value="" />
         </MavenRunnerSettings>
       </option>
       <option name="myRunnerParameters">
diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
index 685d9af..71d8db5 100755
--- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
@@ -209,9 +209,13 @@ public class AuthServiceImpl implements AuthService {
     public BaseResponse authLogout(HttpServletRequest request) {
         // 获取用户
         UserDO userDO = userMapper.getUserById(Processing.getAuthHeaderToUserId(request));
-        // 删除Token
-        if (tokenRedisUtil.delData(BusinessConstants.BUSINESS_LOGIN, userDO.getId().toString())) {
-            return ResultUtil.success("登出成功");
+        if (userDO != null) {
+            // 删除Token
+            if (tokenRedisUtil.delData(BusinessConstants.BUSINESS_LOGIN, userDO.getId().toString())) {
+                return ResultUtil.success("登出成功");
+            } else {
+                return ResultUtil.error(ErrorCode.TOKEN_NOT_EXIST);
+            }
         } else {
             return ResultUtil.error(ErrorCode.TOKEN_NOT_EXIST);
         }