From 518559bd07b2cc00d194a8b7996bde766e602750 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 29 七月 2024 18:15:21 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 2fb3073..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");
}
@@ -544,6 +546,7 @@
public R<SysUser> queryUserByUserName(@RequestBody String userName){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getUserName, userName)
+ .eq(SysUser::getDelFlag, "0")
.last("LIMIT 1"));
return R.ok(user);
}
@@ -586,7 +589,7 @@
}
@InnerAuth
- @GetMapping("/list-by-name")
+ @PostMapping("/list-by-name")
R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) {
List<SysUser> list = userService.lambdaQuery()
.like(StringUtils.isNotBlank(sysUser.getNickName()), SysUser::getNickName,
--
Gitblit v1.7.1