From 8b8305b82f23b672023d8a3d1d1d7030af3f110c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 15:44:02 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 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 3f300d1..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);
+	}
 	
 	/**
 	 * 新增用户角色信息
@@ -442,7 +450,7 @@
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public int deleteUserByIds(Long[] userIds) {
+	public void deleteUserByIds(Long[] userIds) {
         Long userid = tokenService.getLoginUser().getUserid();
         SysUser sysUser = this.getById(userid);
         for (Long userId : userIds) {
@@ -466,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