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 5555b6da8..c5fc873ea 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 @@ -486,6 +486,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl queryWrapper.eq(SysRole::getRoleCategoryId, sysRoleRequest.getRoleCategoryId()); } + // 根据公司id查询角色 + if (ObjectUtil.isNotEmpty(sysRoleRequest.getRoleCompanyId())) { + queryWrapper.eq(SysRole::getRoleCompanyId, sysRoleRequest.getRoleCompanyId()); + } + // 排序字段 queryWrapper.orderByAsc(SysRole::getRoleType); queryWrapper.orderByAsc(SysRole::getRoleSort);