From 9153a858f1ae61fa29bb7a926e7d50359117cd69 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 14:32:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..e71b4f8 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查询用户
@@ -441,6 +445,7 @@
* @return 结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int deleteUserByIds(Long[] userIds) {
Long userid = tokenService.getLoginUser().getUserid();
SysUser sysUser = this.getById(userid);
@@ -465,12 +470,10 @@
}
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