作者 陈志颖

Merge branch 'dev'

  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: department
  5 + description: 部门
  6 + type:
  7 + schema: department
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: organizations
  5 + description: 关联的组织机构
  6 + type:
  7 + array: organization
@@ -19,6 +19,8 @@ metadata: @@ -19,6 +19,8 @@ metadata:
19 - ref: organization 19 - ref: organization
20 description: 数据关联组织机构 20 description: 数据关联组织机构
21 required: true 21 required: true
  22 + - ref: companyId
  23 + required: true
22 - ref: updatedAt 24 - ref: updatedAt
23 required: true 25 required: true
24 - ref: deletedAt 26 - ref: deletedAt
@@ -27,6 +27,8 @@ metadata: @@ -27,6 +27,8 @@ metadata:
27 - ref: organization 27 - ref: organization
28 description: 数据关联组织机构 28 description: 数据关联组织机构
29 required: true 29 required: true
  30 + - ref: companyId
  31 + required: true
30 - ref: createdAt 32 - ref: createdAt
31 required: true 33 required: true
32 - ref: deletedAt 34 - ref: deletedAt
@@ -28,6 +28,8 @@ metadata: @@ -28,6 +28,8 @@ metadata:
28 - ref: organization 28 - ref: organization
29 description: 数据关联组织机构 29 description: 数据关联组织机构
30 required: true 30 required: true
  31 + - ref: companyId
  32 + required: true
31 - ref: operator 33 - ref: operator
32 required: true 34 required: true
33 - ref: operateTime 35 - ref: operateTime
@@ -14,6 +14,8 @@ metadata: @@ -14,6 +14,8 @@ metadata:
14 required: true 14 required: true
15 - ref: undertakers 15 - ref: undertakers
16 required: true 16 required: true
  17 + - ref: companyId
  18 + required: true
17 - ref: operator 19 - ref: operator
18 required: true 20 required: true
19 - ref: updatedAt 21 - ref: updatedAt
@@ -18,6 +18,8 @@ metadata: @@ -18,6 +18,8 @@ metadata:
18 - ref: organization 18 - ref: organization
19 description: 数据关联组织机构 19 description: 数据关联组织机构
20 required: true 20 required: true
  21 + - ref: companyId
  22 + required: true
21 - ref: remarks 23 - ref: remarks
22 required: true 24 required: true
23 - ref: operator 25 - ref: operator
@@ -24,6 +24,8 @@ metadata: @@ -24,6 +24,8 @@ metadata:
24 - ref: organization 24 - ref: organization
25 description: 数据关联组织机构 25 description: 数据关联组织机构
26 required: true 26 required: true
  27 + - ref: companyId
  28 + required: true
27 - ref: operator 29 - ref: operator
28 required: true 30 required: true
29 - ref: operateTime 31 - ref: operateTime
@@ -32,6 +32,8 @@ metadata: @@ -32,6 +32,8 @@ metadata:
32 - ref: organization 32 - ref: organization
33 description: 数据关联组织机构 33 description: 数据关联组织机构
34 required: true 34 required: true
  35 + - ref: companyId
  36 + required: true
35 - ref: operator 37 - ref: operator
36 required: true 38 required: true
37 - ref: operateTime 39 - ref: operateTime
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: department
  5 + description: 部门值对象
  6 + attributes:
  7 + - ref: departmentId
  8 + required: true
  9 + - ref: departmentName
  10 + required: true
  11 + - ref: departmentNumber
  12 + required: true
  13 + - ref: IsOrganization
  14 + required: true
@@ -28,6 +28,8 @@ metadata: @@ -28,6 +28,8 @@ metadata:
28 - ref: organization 28 - ref: organization
29 description: 数据关联组织机构 29 description: 数据关联组织机构
30 required: true 30 required: true
  31 + - ref: companyId
  32 + required: true
31 - ref: operator 33 - ref: operator
32 required: true 34 required: true
33 - ref: operateTime 35 - ref: operateTime
@@ -24,6 +24,8 @@ metadata: @@ -24,6 +24,8 @@ metadata:
24 - ref: organization 24 - ref: organization
25 description: 数据关联组织机构 25 description: 数据关联组织机构
26 required: true 26 required: true
  27 + - ref: companyId
  28 + required: true
27 - ref: updatedAt 29 - ref: updatedAt
28 required: true 30 required: true
29 - ref: deletedAt 31 - ref: deletedAt
@@ -28,6 +28,8 @@ metadata: @@ -28,6 +28,8 @@ metadata:
28 - ref: organization 28 - ref: organization
29 description: 数据关联组织机构 29 description: 数据关联组织机构
30 required: true 30 required: true
  31 + - ref: companyId
  32 + required: true
31 - ref: createdAt 33 - ref: createdAt
32 required: true 34 required: true
33 - ref: deletedAt 35 - ref: deletedAt
@@ -35,6 +35,8 @@ metadata: @@ -35,6 +35,8 @@ metadata:
35 - ref: organization 35 - ref: organization
36 description: 数据关联组织机构 36 description: 数据关联组织机构
37 required: true 37 required: true
  38 + - ref: companyId
  39 + required: true
38 - ref: createdAt 40 - ref: createdAt
39 required: true 41 required: true
40 - ref: deletedAt 42 - ref: deletedAt
@@ -26,6 +26,8 @@ metadata: @@ -26,6 +26,8 @@ metadata:
26 - ref: organization 26 - ref: organization
27 description: 数据关联组织机构 27 description: 数据关联组织机构
28 required: true 28 required: true
  29 + - ref: companyId
  30 + required: true
29 - ref: updatedAt 31 - ref: updatedAt
30 required: true 32 required: true
31 - ref: deletedAt 33 - ref: deletedAt
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: referrer
  5 + description: 推荐人值对象
  6 + attributes:
  7 + - ref: userId
  8 + required: true
  9 + - ref: userBaseId
  10 + required: true
  11 + - ref: role
  12 + required: true
  13 + - ref: organizations
  14 + description: 用户关联的组织机构
  15 + required: true
  16 + - ref: organization
  17 + description: 用户所属的组织机构
  18 + required: true
  19 + - ref: department
  20 + description: 用户所属的部门
  21 + required: true
  22 + - ref: company
  23 + required: true
  24 + - ref: userInfo
  25 + required: true
  26 + - ref: userType
  27 + required: true
@@ -2,11 +2,20 @@ version: v1 @@ -2,11 +2,20 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: relevant 4 name: relevant
5 - description: 共创合约相关人 5 + description: 共创合约相关人值对象
6 attributes: 6 attributes:
7 - ref: userId 7 - ref: userId
8 required: true 8 required: true
9 - - ref: orgnization 9 + - ref: usersBaseId
  10 + required: true
  11 + - ref: organization
  12 + description: 用户所属的组织机构
  13 + required: true
  14 + - ref: organizations
  15 + description: 用户关联的组织机构
  16 + required: true
  17 + - ref: department
  18 + description: 用户所属的部门
10 required: true 19 required: true
11 - ref: role 20 - ref: role
12 required: true 21 required: true
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: role 4 name: role
5 - description: 用户角色 5 + description: 用户角色值对象
6 attributes: 6 attributes:
7 - ref: roleId 7 - ref: roleId
8 required: true 8 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: salesman
  5 + description: 业务员值对象
  6 + attributes:
  7 + - ref: userId
  8 + required: true
  9 + - ref: userBaseId
  10 + required: true
  11 + - ref: role
  12 + required: true
  13 + - ref: organizations
  14 + description: 用户关联的组织机构
  15 + required: true
  16 + - ref: organization
  17 + description: 用户所属的组织机构
  18 + required: true
  19 + - ref: department
  20 + description: 用户所属的部门
  21 + required: true
  22 + - ref: company
  23 + required: true
  24 + - ref: userInfo
  25 + required: true
  26 + - ref: userType
  27 + required: true
@@ -2,14 +2,20 @@ version: v1 @@ -2,14 +2,20 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: undertaker 4 name: undertaker
5 - description: 共创合约承接方 5 + description: 共创合约承接方值对象
6 attributes: 6 attributes:
7 - ref: userId 7 - ref: userId
8 required: true 8 required: true
9 - ref: usersBaseId 9 - ref: usersBaseId
10 required: true 10 required: true
11 - ref: organization 11 - ref: organization
12 - description: 用户关联组织机构 12 + description: 用户所属组织机构
  13 + required: true
  14 + - ref: organizations
  15 + description: 用户关联的组织机构
  16 + required: true
  17 + - ref: department
  18 + description: 用户所属的部门
13 required: true 19 required: true
14 - ref: role 20 - ref: role
15 required: true 21 required: true
@@ -9,13 +9,20 @@ metadata: @@ -9,13 +9,20 @@ metadata:
9 - ref: usersBaseId 9 - ref: usersBaseId
10 required: true 10 required: true
11 - ref: organization 11 - ref: organization
12 - description: 用户关联组织机构 12 + description: 用户所属组织机构
13 required: true 13 required: true
  14 + - ref: organizations
  15 + description: 用户关联的组织机构
  16 + required: true
  17 + - ref: department
  18 + description: 用户所属的部门
  19 + required:
14 - ref: role 20 - ref: role
15 required: true 21 required: true
16 - ref: userInfo 22 - ref: userInfo
17 required: true 23 required: true
18 - ref: userType 24 - ref: userType
  25 + description: 用户类型
19 required: true 26 required: true
20 - ref: status 27 - ref: status
21 required: true 28 required: true