From e9fa387e02684f7af8730bd027ab9f73509f996d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 1 Sep 2025 10:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/SysRoleServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index 5357388d..d34afd8b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -254,16 +254,15 @@ public class SysRoleServiceImpl extends ServiceImpl imp BeanUtil.copyProperties(roleEditDTO, role); boolean b = updateById(role); if (b) { - if (roleEditDTO.getAdminMenuIdList() != null && !roleEditDTO.getAdminMenuIdList().isEmpty() || roleEditDTO.getCashMenuIdList() != null && !roleEditDTO.getCashMenuIdList().isEmpty()) { - sysRolesMenusService.updateChain().eq(SysRolesMenus::getRoleId, role.getId()).remove(); - } - if (roleEditDTO.getAdminMenuIdList() != null && !roleEditDTO.getAdminMenuIdList().isEmpty()) { - addMenu(role.getId(), roleEditDTO.getAdminMenuIdList(), true); + sysRolesMenusService.updateChain().eq(SysRolesMenus::getRoleId, role.getId()).eq(SysRolesMenus::getType, 0).remove(); + + addMenu(role.getId(), roleEditDTO.getAdminMenuIdList().stream().distinct().toList(), true); } if (roleEditDTO.getCashMenuIdList() != null && !roleEditDTO.getCashMenuIdList().isEmpty()) { - addMenu(role.getId(), roleEditDTO.getCashMenuIdList(), false); + sysRolesMenusService.updateChain().eq(SysRolesMenus::getRoleId, role.getId()).eq(SysRolesMenus::getType, 1).remove(); + addMenu(role.getId(), roleEditDTO.getCashMenuIdList().stream().distinct().toList(), false); } return true; }