From af6c2b2e4c11e344472e5e7def31b79434f93949 Mon Sep 17 00:00:00 2001
From: stylefeng <sn93@qq.com>
Date: Wed, 5 Feb 2025 18:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90role=E3=80=91?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=AC=E5=8F=B8id=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/role/service/impl/RoleCategoryServiceImpl.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java
index 0219007a5..aa019d5bc 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java
@@ -140,6 +140,10 @@ public class RoleCategoryServiceImpl extends ServiceImpl<RoleCategoryMapper, Rol
         Integer categoryType = roleCategoryRequest.getCategoryType();
         queryWrapper.eq(ObjectUtil.isNotEmpty(categoryType), RoleCategory::getCategoryType, roleCategoryRequest.getCategoryType());
 
+        // 根据指定公司查询
+        Long companyId = roleCategoryRequest.getCompanyId();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(companyId), RoleCategory::getCompanyId, roleCategoryRequest.getCompanyId());
+
         queryWrapper.orderByAsc(RoleCategory::getFldSort);
 
         return queryWrapper;