Skip to content

[Fix-4492] Fix role menu update issue #4499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aiwenmo merged 2 commits into from
Nov 5, 2025
Merged

[Fix-4492] Fix role menu update issue #4499

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55414bb
[Fix-4492] Fix role menu update issue
aiwenmo Nov 5, 2025
4b38135
spotless apply
aiwenmo Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions dinky-admin/src/main/java/org/dinky/service/impl/RoleMenuServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,46 +28,42 @@
import org.dinky.service.RoleMenuService;

import java.util.List;
import java.util.stream.Collectors;

import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import cn.hutool.core.collection.CollUtil;
import org.springframework.transaction.annotation.Transactional;

@Service
public class RoleMenuServiceImpl extends SuperServiceImpl<RoleMenuMapper, RoleMenu> implements RoleMenuService {

@Override
@Transactional(rollbackFor = Exception.class)
public Result<Void> assignMenuToRole(AssignMenuToRoleDTO assignMenuToRoleDto) {

if (CollUtil.isEmpty(assignMenuToRoleDto.getMenuIds())) {
return Result.failed(Status.SELECT_MENU);
}

int insertSize = 0;
// 先删除原有的关系
List<RoleMenu> roleMenus = getBaseMapper()
.selectList(
new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, assignMenuToRoleDto.getRoleId()));

// if not empty , delete all role menus
if (CollUtil.isNotEmpty(roleMenus)) {
roleMenus.forEach(rm -> {
getBaseMapper().delete(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getMenuId, rm.getMenuId()));
});
}

// then insert new role menus
for (Integer id : assignMenuToRoleDto.getMenuIds()) {
RoleMenu roleMenu = new RoleMenu();
roleMenu.setRoleId(assignMenuToRoleDto.getRoleId());
roleMenu.setMenuId(id);
insertSize += getBaseMapper().insert(roleMenu);
}

if (assignMenuToRoleDto.getMenuIds().size() == insertSize) {
getBaseMapper()
.delete(new LambdaQueryWrapper<RoleMenu>().eq(RoleMenu::getRoleId, assignMenuToRoleDto.getRoleId()));
List<RoleMenu> newRoles = assignMenuToRoleDto.getMenuIds().stream()
.map(menuId -> {
RoleMenu roleMenu = new RoleMenu();
roleMenu.setRoleId(assignMenuToRoleDto.getRoleId());
roleMenu.setMenuId(menuId);
return roleMenu;
})
.collect(Collectors.toList());
boolean res = saveBatch(newRoles);
if (res) {
return Result.succeed(Status.ASSIGN_MENU_SUCCESS);
} else {
return Result.failed(Status.ASSIGN_MENU_FAILED);
}
return Result.failed(Status.ASSIGN_MENU_FAILED);
}
}
Loading