fix(service): 修复获取不到用户信息

修复对于 token 的解析获取无法获取到 userDO 的情况进行异常返回

.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">

src/main/java/com/jsl/oa/dao/PermissionDAO.java

@@ -45,17 +45,27 @@ public class PermissionDAO {
     public List<String> getPermission(@NotNull Long uid) {
         // 查询用户所在角色组
         RoleDO getRole = roleMapper.getRoleByUserId(uid);
-        List<String> getPermissionForString;
+        if (getRole != null) {
-        String permissionRedisString = roleRedisUtil.getData(BusinessConstants.NONE, uid.toString());
+            List<String> getPermissionForString;
-        if (permissionRedisString == null) {
+            String permissionRedisString = roleRedisUtil.getData(BusinessConstants.NONE, uid.toString());
-            String permissionList = permissionMapper.getPermissionByRole(getRole.getRoleName());
+            if (permissionRedisString == null) {
-            getPermissionForString = gson.fromJson(permissionList, new TypeToken<List<String>>() { }.getType());
+                String permissionList = permissionMapper.getPermissionByRole(getRole.getRoleName());
-            // 存入 Redis
+                getPermissionForString = gson.fromJson(permissionList, new TypeToken<List<String>>() { }.getType());
-            roleRedisUtil.setData(BusinessConstants.NONE, uid.toString(), gson.toJson(getPermissionForString), 1440);
+                // 存入 Redis
+                roleRedisUtil.setData(
+                        BusinessConstants.NONE,
+                        uid.toString(),
+                        gson.toJson(getPermissionForString),
+                        1440
+                );
+            } else {
+                getPermissionForString = gson
+                        .fromJson(permissionRedisString, new TypeToken<List<String>>() { }.getType());
+            }
+            return getPermissionForString;
         } else {
-            getPermissionForString = gson.fromJson(permissionRedisString, new TypeToken<List<String>>() { }.getType());
+            return null;
         }
-        return getPermissionForString;
     }
 
     public List<String> getAllPermissionBuildString() {
@@ -69,7 +79,7 @@ public class PermissionDAO {
             roleRedisUtil.setData(
                     BusinessConstants.ALL_PERMISSION,
                     "string",
-                    gson.toJson(permissionList),
+                    gson.toJson(getPermission),
                     1440);
         } else {
             getPermission = gson.fromJson(getRedisData, new TypeToken<List<String>>() { }.getType());

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 (userDO != null) {
-        if (tokenRedisUtil.delData(BusinessConstants.BUSINESS_LOGIN, userDO.getId().toString())) {
+            // 删除Token
-            return ResultUtil.success("登出成功");
+            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);
         }