diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysMenuServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysMenuServiceApi.java index 0fe974352..3b04b9bd3 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysMenuServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysMenuServiceApi.java @@ -24,6 +24,7 @@ */ package cn.stylefeng.roses.kernel.sys.api; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.pojo.menu.UserAppMenuInfo; import java.util.List; @@ -84,4 +85,24 @@ public interface SysMenuServiceApi { */ List getMenuOptions(Long menuId, Set roleLimitMenuIdsAndOptionIds); + /** + * 获取应用下的所有菜单id + * + * @param appId 指定应用id + * @param roleLimitMenuIdsAndOptionIds 被限制指定范围的菜单集合 + * @author fengshuonan + * @since 2023/9/8 15:03 + */ + Set getAppMenuIds(Long appId, Set roleLimitMenuIdsAndOptionIds); + + /** + * 获取应用下的所有菜单功能 + * + * @param appId 应用id + * @param roleLimitMenuIdsAndOptionIds 被限制的功能和id集合 + * @author fengshuonan + * @since 2023/9/8 15:13 + */ + List getAppMenuOptions(Long appId, Set roleLimitMenuIdsAndOptionIds); + } diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/entity/SysMenuOptions.java similarity index 95% rename from kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java rename to kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/entity/SysMenuOptions.java index 58de0c7e3..54476271f 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/entity/SysMenuOptions.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/entity/SysMenuOptions.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.sys.modular.menu.entity; +package cn.stylefeng.roses.kernel.sys.api.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/controller/SysMenuOptionsController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/controller/SysMenuOptionsController.java index 49974e900..ccd3b1146 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/controller/SysMenuOptionsController.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/controller/SysMenuOptionsController.java @@ -7,7 +7,7 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; import cn.stylefeng.roses.kernel.sys.api.constants.PermissionCodeConstants; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.pojo.request.SysMenuOptionsRequest; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService; import jakarta.annotation.Resource; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/factory/MenuOptionsValidateFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/factory/MenuOptionsValidateFactory.java index 6ca826f41..f82bdcb7a 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/factory/MenuOptionsValidateFactory.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/factory/MenuOptionsValidateFactory.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.menu.factory; import cn.hutool.extra.spring.SpringUtil; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.enums.SysMenuOptionsExceptionEnum; import cn.stylefeng.roses.kernel.sys.modular.menu.pojo.request.SysMenuOptionsRequest; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/mapper/SysMenuOptionsMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/mapper/SysMenuOptionsMapper.java index 4294b4f57..2c9539cdd 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/mapper/SysMenuOptionsMapper.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/mapper/SysMenuOptionsMapper.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.sys.modular.menu.mapper; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuOptionsService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuOptionsService.java index 0272efcb1..30c2d2749 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuOptionsService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/SysMenuOptionsService.java @@ -1,7 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.menu.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.pojo.request.SysMenuOptionsRequest; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuOptionsServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuOptionsServiceImpl.java index 40728368c..d6307a5b7 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuOptionsServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuOptionsServiceImpl.java @@ -11,8 +11,8 @@ import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveMenuCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.constants.MenuConstants; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.enums.SysMenuOptionsExceptionEnum; import cn.stylefeng.roses.kernel.sys.modular.menu.factory.MenuOptionsValidateFactory; import cn.stylefeng.roses.kernel.sys.modular.menu.mapper.SysMenuOptionsMapper; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java index 5ac223168..66d8203df 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/menu/service/impl/SysMenuServiceImpl.java @@ -14,11 +14,11 @@ import cn.stylefeng.roses.kernel.rule.pidset.ParentIdParseUtil; import cn.stylefeng.roses.kernel.rule.tree.buildpids.PidStructureBuildUtil; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveMenuCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.pojo.menu.UserAppMenuInfo; import cn.stylefeng.roses.kernel.sys.modular.app.service.SysAppService; import cn.stylefeng.roses.kernel.sys.modular.menu.constants.MenuConstants; import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.enums.SysMenuExceptionEnum; import cn.stylefeng.roses.kernel.sys.modular.menu.factory.MenuFactory; import cn.stylefeng.roses.kernel.sys.modular.menu.factory.MenuTreeFactory; @@ -305,6 +305,34 @@ public class SysMenuServiceImpl extends ServiceImpl impl return list.stream().map(SysMenuOptions::getMenuOptionId).collect(Collectors.toList()); } + @Override + public Set getAppMenuIds(Long appId, Set roleLimitMenuIdsAndOptionIds) { + LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); + menuLambdaQueryWrapper.eq(SysMenu::getAppId, appId); + // 如果有范围限制,则查询范围内的菜单 + if (ObjectUtil.isNotEmpty(roleLimitMenuIdsAndOptionIds)) { + menuLambdaQueryWrapper.in(SysMenu::getMenuId, roleLimitMenuIdsAndOptionIds); + } + menuLambdaQueryWrapper.select(SysMenu::getMenuId); + List totalMenus = this.list(menuLambdaQueryWrapper); + if (ObjectUtil.isEmpty(totalMenus)) { + return new HashSet<>(); + } + return totalMenus.stream().map(SysMenu::getMenuId).collect(Collectors.toSet()); + } + + @Override + public List getAppMenuOptions(Long appId, Set roleLimitMenuIdsAndOptionIds) { + LambdaQueryWrapper menuOptionsLambdaQueryWrapper = new LambdaQueryWrapper<>(); + menuOptionsLambdaQueryWrapper.eq(SysMenuOptions::getAppId, appId); + // 如果有范围限制,则查询范围内的菜单 + if (ObjectUtil.isNotEmpty(roleLimitMenuIdsAndOptionIds)) { + menuOptionsLambdaQueryWrapper.in(SysMenuOptions::getMenuOptionId, roleLimitMenuIdsAndOptionIds); + } + menuOptionsLambdaQueryWrapper.select(SysMenuOptions::getMenuOptionId, SysMenuOptions::getMenuId); + return sysMenuOptionsService.list(menuOptionsLambdaQueryWrapper); + } + @Override public List completeParentMenu(List menuList) { if (ObjectUtil.isEmpty(menuList)) { diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java index 51ef1c53d..ca8de4742 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/factory/PermissionAssignFactory.java @@ -2,11 +2,11 @@ package cn.stylefeng.roses.kernel.sys.modular.role.factory; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.enums.PermissionNodeTypeEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.role.response.RoleBindPermissionItem; import cn.stylefeng.roses.kernel.sys.modular.app.entity.SysApp; import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import java.util.ArrayList; import java.util.List; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleMenuOptionsService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleMenuOptionsService.java index a67c5bb60..bcb7fb9ca 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleMenuOptionsService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleMenuOptionsService.java @@ -1,6 +1,6 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.role.entity.SysRoleMenuOptions; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java index b766f6ce2..460e2aad3 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/PermissionAssignServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.extra.spring.SpringUtil; import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher; import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil; import cn.stylefeng.roses.kernel.sys.api.SysUserRoleServiceApi; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.factory.RoleBindPermissionFactory; import cn.stylefeng.roses.kernel.sys.api.pojo.role.request.RoleBindPermissionRequest; import cn.stylefeng.roses.kernel.sys.api.pojo.role.response.RoleBindPermissionItem; @@ -12,7 +13,6 @@ import cn.stylefeng.roses.kernel.sys.api.pojo.role.response.RoleBindPermissionRe import cn.stylefeng.roses.kernel.sys.modular.app.entity.SysApp; import cn.stylefeng.roses.kernel.sys.modular.app.service.SysAppService; import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuService; import cn.stylefeng.roses.kernel.sys.modular.role.action.RoleAssignOperateAction; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindAppImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindAppImpl.java index 6999e5264..63fb39b3a 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindAppImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindAppImpl.java @@ -2,10 +2,9 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service.impl; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.enums.PermissionNodeTypeEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.role.request.RoleBindPermissionRequest; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuService; import cn.stylefeng.roses.kernel.sys.modular.role.action.RoleAssignOperateAction; @@ -23,7 +22,6 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -65,13 +63,13 @@ public class RoleBindAppImpl implements RoleAssignOperateAction, RoleBindLimitAc Long appId = roleBindPermissionRequest.getNodeId(); // 找到所选应用的对应的所有菜单 - Set appMenuIds = this.getAppMenuIds(appId, roleLimitMenuIdsAndOptionIds); + Set appMenuIds = this.sysMenuService.getAppMenuIds(appId, roleLimitMenuIdsAndOptionIds); if (ObjectUtil.isEmpty(appMenuIds)) { return; } // 找到所选应用的对应的所有菜单功能 - List totalMenuOptions = this.getAppMenuOptions(appId, roleLimitMenuIdsAndOptionIds); + List totalMenuOptions = this.sysMenuService.getAppMenuOptions(appId, roleLimitMenuIdsAndOptionIds); Set totalMenuOptionIds = totalMenuOptions.stream().map(SysMenuOptions::getMenuOptionId).collect(Collectors.toSet()); // 先删除角色绑定的这些菜单 @@ -126,7 +124,7 @@ public class RoleBindAppImpl implements RoleAssignOperateAction, RoleBindLimitAc Long appId = roleBindPermissionRequest.getNodeId(); // 找到所选应用的对应的所有菜单 - Set menuIds = this.getAppMenuIds(appId); + Set menuIds = this.sysMenuService.getAppMenuIds(appId, null); // 菜单为空,则直接返回 if (ObjectUtil.isEmpty(menuIds)) { @@ -134,7 +132,7 @@ public class RoleBindAppImpl implements RoleAssignOperateAction, RoleBindLimitAc } // 找到所选应用的对应的所有菜单功能 - List totalMenuOptions = this.getAppMenuOptions(appId); + List totalMenuOptions = this.sysMenuService.getAppMenuOptions(appId, null); Set menuOptionIds = totalMenuOptions.stream().map(SysMenuOptions::getMenuOptionId).collect(Collectors.toSet()); // 组装菜单id和功能id的集合 @@ -178,62 +176,4 @@ public class RoleBindAppImpl implements RoleAssignOperateAction, RoleBindLimitAc } - /** - * 获取应用下的所有菜单id - * - * @author fengshuonan - * @since 2023/9/8 15:03 - */ - private Set getAppMenuIds(Long appId) { - return this.getAppMenuIds(appId, null); - } - - /** - * 获取应用下的所有菜单id - * - * @author fengshuonan - * @since 2023/9/8 15:03 - */ - private Set getAppMenuIds(Long appId, Set roleLimitMenuIdsAndOptionIds) { - LambdaQueryWrapper menuLambdaQueryWrapper = new LambdaQueryWrapper<>(); - menuLambdaQueryWrapper.eq(SysMenu::getAppId, appId); - // 如果有范围限制,则查询范围内的菜单 - if (ObjectUtil.isNotEmpty(roleLimitMenuIdsAndOptionIds)) { - menuLambdaQueryWrapper.in(SysMenu::getMenuId, roleLimitMenuIdsAndOptionIds); - } - menuLambdaQueryWrapper.select(SysMenu::getMenuId); - List totalMenus = sysMenuService.list(menuLambdaQueryWrapper); - if (ObjectUtil.isEmpty(totalMenus)) { - return new HashSet<>(); - } - return totalMenus.stream().map(SysMenu::getMenuId).collect(Collectors.toSet()); - } - - /** - * 获取应用下的所有菜单功能 - * - * @author fengshuonan - * @since 2023/9/8 15:13 - */ - private List getAppMenuOptions(Long appId) { - return this.getAppMenuOptions(appId, null); - } - - /** - * 获取应用下的所有菜单功能 - * - * @author fengshuonan - * @since 2023/9/8 15:13 - */ - private List getAppMenuOptions(Long appId, Set roleLimitMenuIdsAndOptionIds) { - LambdaQueryWrapper menuOptionsLambdaQueryWrapper = new LambdaQueryWrapper<>(); - menuOptionsLambdaQueryWrapper.eq(SysMenuOptions::getAppId, appId); - // 如果有范围限制,则查询范围内的菜单 - if (ObjectUtil.isNotEmpty(roleLimitMenuIdsAndOptionIds)) { - menuOptionsLambdaQueryWrapper.in(SysMenuOptions::getMenuOptionId, roleLimitMenuIdsAndOptionIds); - } - menuOptionsLambdaQueryWrapper.select(SysMenuOptions::getMenuOptionId, SysMenuOptions::getMenuId); - return sysMenuOptionsService.list(menuOptionsLambdaQueryWrapper); - } - } diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java index 4a29054cf..84f2dbdf5 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleBindTotalImpl.java @@ -1,9 +1,9 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service.impl; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.enums.PermissionNodeTypeEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.role.request.RoleBindPermissionRequest; import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuService; import cn.stylefeng.roses.kernel.sys.modular.role.action.RoleAssignOperateAction; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java index e57af6086..5e2690bed 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java @@ -7,7 +7,7 @@ import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveMenuCallbackApi; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveRoleCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.role.entity.SysRoleMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.role.mapper.SysRoleMenuOptionsMapper; import cn.stylefeng.roses.kernel.sys.modular.role.service.SysRoleMenuOptionsService; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java index 95c5e60d6..76981182e 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -16,10 +16,10 @@ import cn.stylefeng.roses.kernel.rule.enums.permission.DataScopeTypeEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveRoleCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; +import cn.stylefeng.roses.kernel.sys.api.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.api.enums.role.RoleTypeEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.role.SysRoleDTO; import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenu; -import cn.stylefeng.roses.kernel.sys.modular.menu.entity.SysMenuOptions; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuOptionsService; import cn.stylefeng.roses.kernel.sys.modular.menu.service.SysMenuService; import cn.stylefeng.roses.kernel.sys.modular.role.entity.SysRole;