From 9fde9f917552f659d41fcfce5094f429a29b8ead Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 16:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 8e00e0e..0d15ced 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -137,6 +137,10 @@
public SysUser selectUserByUserName(String userName) {
return userMapper.selectUserByUserName(userName);
}
+ @Override
+ public SysUser selectUserShopByUserName(String userName) {
+ return userMapper.selectUserShopByUserName(userName);
+ }
/**
* 通过用户ID查询用户
@@ -368,6 +372,10 @@
public int resetUserPwd(String userName, String password) {
return userMapper.resetUserPwd(userName, password);
}
+ @Override
+ public int resetUserShopPwd(String userName, String password) {
+ return userMapper.resetUserShopPwd(userName, password);
+ }
/**
* 新增用户角色信息
@@ -441,7 +449,8 @@
* @return 结果
*/
@Override
- public int deleteUserByIds(Long[] userIds) {
+ @Transactional(rollbackFor = Exception.class)
+ public void deleteUserByIds(Long[] userIds) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = this.getById(userid);
for (Long userId : userIds) {
@@ -465,15 +474,12 @@
}
long count = userShopService.count(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()));
if(0 == count){
- user.setDelFlag("2");
- userMapper.updateById(user);
+ userMapper.deleteUserById(user.getUserId());
}
}else{
- user.setDelFlag("2");
- userMapper.updateById(user);
+ userMapper.deleteUserById(user.getUserId());
}
}
- return 0;
}
/**
--
Gitblit v1.7.1