restruct

@@ -28,10 +28,6 @@ metadata:
       description: 菜单类型 （模块module、子模块submodule、菜单menu、按钮button）
       description: 菜单类型 （模块module、子模块submodule、菜单menu、按钮button）
       type:
       type:
         primitive: string
         primitive: string
-    - name: status
-      description: 菜单状态 bit0:启用(1)/禁用(0)  bit1:启用收藏(1)/禁用收藏(0)(默认禁用)
-      type:
-        primitive: int
     - name: access
     - name: access
       description: 关联权限
       description: 关联权限
       type:
       type:
@@ -57,6 +53,6 @@ metadata:
       type:
       type:
         primitive: string
         primitive: string
     - name: isPublish
     - name: isPublish
-      description: 是否是公开的菜单，[0:否],[1:是],默认否
+      description: 状态是否是公开的菜单，[0:否],[1:是],默认否
       type:
       type:
         primitive: int
         primitive: int

+version: v1
+kind: Schema
+metadata:
+  name: menuAccess
+  description: 菜单权限
+  attributes:
+    - name: web
+      description: web菜单权限
+      type:
+        array: int64
+    - name: app
+      description: app菜单权限
+      type:
+        array: int64

@@ -4,19 +4,21 @@ metadata:
   name: role
   name: role
   description: 角色 （base)
   description: 角色 （base)
   attributes:
   attributes:
-  - ref: roleId
-    required: true
-  - ref: companyId
-    required: true
-  - ref: organizationId
-    required: true
-  - ref: roleName
-    required: true
-  - name: menuAccess
-    description: 菜单权限列表
-    type: 
-      array: int64
-  - name: description
-    description: 描述
-    type: 
-      primitive: string
+    - ref: roleId
+      required: true
+    - ref: companyId
+      required: true
+    - name: organization
+      description: 组织信息
+      type:
+        schema: organization
+    - ref: roleName
+      required: true
+    - name: menuAccess
+      description: 菜单权限列表
+      type:
+        schema: menuAccess
+    - name: desc
+      description: 角色描述
+      type:
+        primitive: string

@@ -19,11 +19,11 @@ metadata:
     - name: organization
     - name: organization
       description: 组织机构
       description: 组织机构
       type:
       type:
-        primitive: int64
+        schema: organization
     - name: department
     - name: department
       description: 所属部门
       description: 所属部门
       type:
       type:
-        primitive: int64
+        schema: organization
     - name: organizationRoles
     - name: organizationRoles
       description: 组织权限列表
       description: 组织权限列表
       type:
       type:
@@ -35,7 +35,7 @@ metadata:
     - name: cooperationInfo
     - name: cooperationInfo
       description: 共创信息 （共创用户有效）
       description: 共创信息 （共创用户有效）
       type:
       type:
-        primitive: cooperationInfo
+        schema: cooperationInfo
     - name: enableStatus
     - name: enableStatus
       description: 启用状态(启用:1 禁用:2)
       description: 启用状态(启用:1 禁用:2)
       type:
       type: