From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/service/system/RoleService.java | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/system/RoleService.java b/src/main/java/com/mzl/flower/service/system/RoleService.java
index 9780186..0e771c1 100644
--- a/src/main/java/com/mzl/flower/service/system/RoleService.java
+++ b/src/main/java/com/mzl/flower/service/system/RoleService.java
@@ -69,10 +69,7 @@
//获取角色详情
Role role = roleMapper.selectById(id);
//获取角色下的菜单
- QueryWrapper queryWrapper = new QueryWrapper<RoleMenu>().and(roleMenuQueryWrapper -> {
- return roleMenuQueryWrapper
- .eq("ROLE_ID", id);
- });
+ QueryWrapper queryWrapper = new QueryWrapper<RoleMenu>().eq("ROLE_ID", id);
List<RoleMenu> roleMenus = roleMenuMapper.selectList(queryWrapper);
List<String> menuIds = new ArrayList<>();
@@ -89,10 +86,7 @@
private void addRoleMenus(String id, List<String> menuIds){
//删除角色已存在的菜单
- QueryWrapper deleteQuery = new QueryWrapper<RoleMenu>().and(roleMenuQueryWrapper -> {
- return roleMenuQueryWrapper
- .eq("ROLE_ID", id);
- });
+ QueryWrapper deleteQuery = new QueryWrapper<RoleMenu>().eq("ROLE_ID", id);
roleMenuMapper.delete(deleteQuery);
//给角色添加可以访问的菜单
for (String menuId : menuIds) {
@@ -131,17 +125,11 @@
roleMapper.deleteById(id);
//删除角色关联的菜单
- QueryWrapper deleteQuery = new QueryWrapper<RoleMenu>().and(roleMenuQueryWrapper -> {
- return roleMenuQueryWrapper
- .eq("ROLE_ID", id);
- });
+ QueryWrapper deleteQuery = new QueryWrapper<RoleMenu>().eq("ROLE_ID", id);
roleMenuMapper.delete(deleteQuery);
//删除角色关联的用户
- deleteQuery = new QueryWrapper<UserRole>().and(userRoleQueryWrapper -> {
- return userRoleQueryWrapper
- .eq("ROLE_ID", id);
- });
+ deleteQuery = new QueryWrapper<UserRole>().eq("ROLE_ID", id);
userRoleMapper.delete(deleteQuery);
}
--
Gitblit v1.9.3