From d5a62c975afbaff26d17b61fa7b9fde7e2cb035d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期六, 27 七月 2024 11:44:03 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index ce9a62f..c80acde 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -189,6 +189,7 @@
userService.checkUserDataScope(user.getUserId());
SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getPhonenumber, user.getPhonenumber())
+ .in(SysUser::getUserType, "00", "01", "04")
.eq(SysUser::getDelFlag,0)
.last("LIMIT 1"));
@@ -234,9 +235,10 @@
SysUser sysUser = userService.selectUserById(userId);
if (sysUser.getStatus().equals("0")) {
sysUser.setStatus("1");
-
Object tokenObj = redisService.getCacheObject(getUserTokenKey(userId));
- authClient.logout(tokenObj.toString(), SecurityConstants.INNER);
+ if (Objects.nonNull(tokenObj)) {
+ authClient.logout(tokenObj.toString(), SecurityConstants.INNER);
+ }
} else {
sysUser.setStatus("0");
}
--
Gitblit v1.7.1