按钮角色重复

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java

@@ -51,7 +51,7 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
         for (SysButtonInMenu sysButtonInMenu : records){
             ArrayList<Integer> roles = new ArrayList<>();
             for (TaRoleButton taRoleButton : taRoleButtons){
-                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId())){
+                if (sysButtonInMenu.getBtnId().equals(taRoleButton.getBtnId()) && !roles.contains(taRoleButton.getBtnId())){
                     roles.add(taRoleButton.getBtnId());
                 }
             }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -61,7 +61,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         for (SysMenu sysMenu : records){
             ArrayList<Integer> roles = new ArrayList<>();
             for (TaRoleMenu taRoleMenu : taRoleMenus){
-                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId())){
+                if (taRoleMenu.getMenuId().equals(sysMenu.getMenuId()) && !roles.contains(taRoleMenu.getRoleId())){
                     roles.add(taRoleMenu.getRoleId());
                 }
             }