diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java index 9ec47572..89fc4c05 100644 --- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java +++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java @@ -46,7 +46,8 @@ import java.util.List; @Tag(name = "套餐管理 API") @RestController @RequiredArgsConstructor -@CrudRequestMapping(value = "/tenant/package", api = {Api.LIST, Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, Api.DICT}) +@CrudRequestMapping(value = "/tenant/package", api = {Api.LIST, Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, + Api.DICT}) public class PackageController extends BaseController { private final TenantExtensionProperties tenantExtensionProperties; diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/TenantServiceImpl.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/TenantServiceImpl.java index 246177e5..a84c00ea 100644 --- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/TenantServiceImpl.java +++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/service/impl/TenantServiceImpl.java @@ -49,7 +49,6 @@ import top.continew.starter.core.util.validation.CheckUtils; import top.continew.starter.extension.tenant.util.TenantUtils; import java.time.LocalDateTime; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; @@ -160,24 +159,20 @@ public class TenantServiceImpl extends BaseServiceImpl TenantUtils.execute(tenantId, () -> { + // 删除旧菜单 + roleMenuApi.deleteByNotInMenuIds(newMenuIds); // 更新在线用户上下文 Set roleIdSet = roleMenuApi.listRoleIdByNotInMenuIds(newMenuIds); roleIdSet.forEach(roleApi::updateUserContext); - // 删除旧菜单 - roleMenuApi.deleteByNotInMenuIds(newMenuIds); })); // 租户管理员:新增菜单 tenantIdList.forEach(tenantId -> TenantUtils.execute(tenantId, () -> { Long roleId = roleApi.getIdByCode(RoleCodeEnum.TENANT_ADMIN.getCode()); - List oldMenuIdList = roleMenuApi.listMenuIdByRoleIds(List.of(roleId)); - Collection addMenuIdList = CollUtil.disjunction(newMenuIds, oldMenuIdList); - if (CollUtil.isNotEmpty(addMenuIdList)) { - roleMenuApi.add(addMenuIdList.stream().toList(), roleId); - // 更新在线用户上下文 - roleApi.updateUserContext(roleId); - } + roleMenuApi.add(newMenuIds, roleId); + // 更新在线用户上下文 + roleApi.updateUserContext(roleId); })); // 删除缓存 RedisUtils.deleteByPattern(CacheConstants.ROLE_MENU_KEY_PREFIX + StringConstants.ASTERISK);