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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 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 78b7ccb..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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
@@ -13,12 +15,14 @@
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.AuthClient;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.validate.InsertGroup;
import com.ruoyi.system.api.validate.UpdateGroup;
@@ -94,6 +98,10 @@
@Autowired
private ISysUserRoleService sysUserRoleService;
+ @Autowired
+ private AuthClient authClient;
+ @Autowired
+ private RedisService redisService;
/**
* 获取用户列表
*/
@@ -116,7 +124,7 @@
public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
SysUser user = BeanUtils.copyBean(dto, SysUser.class);
user.setUserId(null);
- user.setUserType(dto.getIsAuctioneer() == 1 ? "04" : "00");
+ user.setUserType(dto.getIsAuctioneer() == 1 ? "00" : "01");
user.setUserName(user.getPhonenumber());
if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
user.setNickName(user.getPhonenumber());
@@ -181,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"));
@@ -195,6 +204,7 @@
if (user.getPhonenumber() != null) {
user.setUserName(user.getPhonenumber());
}
+ user.setUserType(dto.getIsAuctioneer() == 1 ? "00" : "01");
user.setPassword(null);
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
@@ -225,12 +235,19 @@
SysUser sysUser = userService.selectUserById(userId);
if (sysUser.getStatus().equals("0")) {
sysUser.setStatus("1");
+ Object tokenObj = redisService.getCacheObject(getUserTokenKey(userId));
+ if (Objects.nonNull(tokenObj)) {
+ authClient.logout(tokenObj.toString(), SecurityConstants.INNER);
+ }
} else {
sysUser.setStatus("0");
}
return toAjax(userService.updateUser(sysUser));
}
+ private String getUserTokenKey(Long userId) {
+ return CacheConstants.USER_TOKEN_KEY + userId;
+ }
@Autowired
private ISysUserRoleService iSysUserRoleService;
@@ -368,7 +385,6 @@
/**
* 重置密码
*/
- @RequiresPermissions("system:user:edit")
@ApiOperation("重置密码")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PostMapping("/resetPwd")
@@ -494,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);
}
@@ -507,9 +531,31 @@
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)
+// .eq(SysUser::getPhonenumber, phone)
+// .eq(SysUser::get, phone)
+// .last("LIMIT 1"));
+// return R.ok(user);
+// }
/**
@@ -521,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);
}
@@ -563,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