From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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..0ff62de 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");
}
@@ -508,7 +510,15 @@
public R<List<SysUser>> queryUserByPhoneList(@RequestBody List<String> phoneList){
List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
.in(SysUser::getPhonenumber, phoneList)
- .ne(SysUser::getDelFlag,2));
+ .eq(SysUser::getUserType,"01")
+ .eq(SysUser::getDelFlag,0));
+ return R.ok(list);
+ }
+
+ @PostMapping("/queryUserByPhoneList1")
+ public R<List<SysUser>> queryUserByPhoneList1(@RequestBody List<String> phoneList){
+ List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
+ .in(SysUser::getPhonenumber, phoneList));
return R.ok(list);
}
@@ -521,10 +531,23 @@
public R<SysUser> queryUserByPhone(@RequestBody String phone){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getPhonenumber, phone)
+ .eq(SysUser::getUserType,"01")
+ .eq(SysUser::getStatus,0)
+ .eq(SysUser::getDelFlag,0)
+ .last("LIMIT 1"));
+ return R.ok(user);
+
+ }
+
+ @PostMapping("/queryUserByPhone1")
+ public R<SysUser> queryUserByPhone1(@RequestBody String phone) {
+ SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
+ .eq(SysUser::getPhonenumber, phone)
+ .eq(SysUser::getDelFlag, 0)
+ .eq(SysUser::getUserType,"01")
.last("LIMIT 1"));
return R.ok(user);
}
-
// @PostMapping("/queryUserByPhone1")
// public R<SysUser> queryUserByPhone1(@RequestBody String phone){
// SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
@@ -544,6 +567,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 +610,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