From 4e7650b1fc3749bb44dcab796fdd978beb610a8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 14:05:30 +0800
Subject: [PATCH] 修改管理后台权限bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 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 5c50770..291ae90 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
@@ -14,6 +14,7 @@
 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.model.UserShop;
 import com.ruoyi.system.api.query.ChangeUserQuery;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.domain.SysUserPost;
@@ -30,10 +31,7 @@
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -78,6 +76,9 @@
 	@Lazy
 	@Resource
 	private ISysDeptService deptService;
+	
+	@Resource
+	private UserShopService userShopService;
 	
 	
 	/**
@@ -449,7 +450,20 @@
 //        userRoleMapper.deleteUserRole(userIds);
 //        // 删除用户与岗位关联
 //        userPostMapper.deleteUserPost(userIds);
-		return userMapper.deleteUserByIds(userIds);
+		int i = userMapper.deleteUserByIds(userIds);
+		List<SysUser> sysUsers = this.listByIds(Arrays.asList(userIds));
+		for (SysUser user : sysUsers) {
+			if(2 == user.getRoleType()){
+				userShopService.remove(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, user.getObjectId()));
+				UserShop userShop = new UserShop();
+				userShop.setUserId(user.getUserId());
+				userShop.setShopId(user.getObjectId());
+				userShop.setRoleType(2);
+				userShop.setRoleId(user.getRoleId());
+				userShopService.save(userShop);
+			}
+		}
+		return i;
 	}
 	
 	/**

--
Gitblit v1.7.1