fix:修复一个租户两个角色时，保存菜单时数据库联合主键冲突

@@ -249,13 +249,17 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
                           .eq(SysRoleEntity::getRoleType, RoleEnum.CUSTOMER_USER.name()));
                           .eq(SysRoleEntity::getRoleType, RoleEnum.CUSTOMER_USER.name()));
               customerRoles.forEach(cr -> menuMapper.removeMenuFromRole(cr.getId(), removeMenus));
               customerRoles.forEach(cr -> menuMapper.removeMenuFromRole(cr.getId(), removeMenus));
             }
             }
-            newMenus.forEach(
-                menu -> {
-                  SysTenantMenuEntity tenantMenu = new SysTenantMenuEntity();
-                  tenantMenu.setMenuId(menu);
-                  tenantMenu.setTenantId(updateTenantId);
-                  tenantMenuMapper.insert(tenantMenu);
-                });
+            if (!newMenus.isEmpty()) {
+              // 如果新增的菜单，在该租户下的另外一个角色已经存在了，就不需要再插入数据库
+              List<String> chechResultList = checkNewMenus(updateTenantId, newMenus);
+              chechResultList.forEach(
+                  menu -> {
+                    SysTenantMenuEntity tenantMenu = new SysTenantMenuEntity();
+                    tenantMenu.setMenuId(menu);
+                    tenantMenu.setTenantId(updateTenantId);
+                    tenantMenuMapper.insert(tenantMenu);
+                  });
+            }
           });
           });
     }
     }
     cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
     cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
@@ -283,4 +287,27 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
     }
     }
     return baseMapper.findRoleInfo(roleDTO);
     return baseMapper.findRoleInfo(roleDTO);
   }
   }
+
+  private List<String> checkNewMenus(String tenantId, List<String> newMenus) {
+    List<SysTenantMenuEntity> existEntities =
+        tenantMenuMapper.selectList(
+            new LambdaQueryWrapper<SysTenantMenuEntity>()
+                .eq(SysTenantMenuEntity::getTenantId, tenantId)
+                .in(SysTenantMenuEntity::getMenuId, newMenus));
+    if (!existEntities.isEmpty()) {
+      List<String> existMenuIds =
+          existEntities.stream().map(SysTenantMenuEntity::getMenuId).collect(Collectors.toList());
+      List<String> tempList = existMenuIds;
+      for (String newMenu : newMenus) {
+        for (String menuId : existMenuIds) {
+          if (Objects.equals(menuId, newMenu)) {
+            tempList.remove(newMenu);
+            break;
+          }
+        }
+      }
+      return tempList;
+    }
+    return newMenus;
+  }
 }
 }