From 582873494e1a736a5cdd9a5be5053968b8fa5cb9 Mon Sep 17 00:00:00 2001
From: stylefeng <sn93@qq.com>
Date: Fri, 24 Jan 2025 11:36:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90role=E3=80=91?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E5=88=86=E7=B1=BB=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E7=9A=84=E5=85=AC=E5=8F=B8id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/kernel/sys/modular/role/entity/RoleCategory.java | 7 +++++++
 .../sys/modular/role/pojo/request/RoleCategoryRequest.java | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java
index 291444888..d0c79ff3c 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java
@@ -57,6 +57,13 @@ public class RoleCategory extends BaseEntity implements AbstractTreeNode<RoleCat
     @ChineseDescription("角色分类类型：15-业务角色，20-公司角色")
     private Integer categoryType;
 
+    /**
+     * 所属公司id，当类型为20-公司角色时使用
+     */
+    @TableField("company_id")
+    @ChineseDescription("所属公司id，当类型为20-公司角色时使用")
+    private Long companyId;
+
     /**
      * 角色分类排序
      */
diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java
index cc61eb4f4..edd6e915e 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java
@@ -47,6 +47,12 @@ public class RoleCategoryRequest extends BaseRequest {
     @ChineseDescription("角色分类类型：15-业务角色，20-公司角色")
     private Integer categoryType;
 
+    /**
+     * 所属公司id，当类型为20-公司角色时使用
+     */
+    @ChineseDescription("所属公司id，当类型为20-公司角色时使用")
+    private Long companyId;
+
     /**
      * 角色分类排序
      */