diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java index 7aec6a924..f0890a1d1 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java @@ -91,7 +91,7 @@ public class HrOrganization extends BaseEntity { /** * 状态:1-启用,2-禁用 */ - @TableField(value = "status_flag",fill = FieldFill.INSERT) + @TableField(value = "status_flag", fill = FieldFill.INSERT) @ChineseDescription("状态:1-启用,2-禁用") private Integer statusFlag; @@ -119,8 +119,36 @@ public class HrOrganization extends BaseEntity { /** * 删除标记(Y-已删除,N-未删除) */ - @TableField(value = "del_flag",fill = FieldFill.INSERT) + @TableField(value = "del_flag", fill = FieldFill.INSERT) @ChineseDescription("删除标记(Y-已删除,N-未删除)") private String delFlag; + /** + * 主数据orgId + */ + @TableField(value = "master_org_id") + @ChineseDescription("主数据orgId") + private String masterOrgId; + + /** + * 主数据的父级id + */ + @TableField(value = "master_org_parent_id") + @ChineseDescription("主数据的父级id") + private String masterOrgParentId; + + /** + * 主数据的简称 + */ + @TableField(value = "master_short_name") + @ChineseDescription("主数据的简称") + private String masterShortName; + + /** + * 主数据组织层级 + */ + @TableField(value = "master_level") + @ChineseDescription("主数据组织层级") + private String masterLevel; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java index e71aa2c7b..1a62fc5e9 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java @@ -159,4 +159,11 @@ public class SysUser extends BaseEntity { */ @TableField("login_count") private Integer loginCount; + + /** + * 主数据用户id + */ + @TableField(value = "master_user_id") + private String masterUserId; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java index 0c972703e..a6d3c9fa9 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java @@ -54,16 +54,41 @@ public class SysUserOrg extends BaseEntity { @TableField("user_id") private Long userId; + /** + * 主数据用户id + */ + @TableField("master_user_id") + private String masterUserId; + /** * 所属机构id */ @TableField("org_id") private Long orgId; + /** + * 主数据组织机构id + */ + @TableField("master_org_id") + private String masterOrgId; + /** * 职位id */ @TableField("position_id") private Long positionId; + /** + * 是否是主部门 + */ + @TableField("main_flag") + private String mainFlag; + + /** + * officeId + */ + @TableField("take_office_id") + private String takeOfficeId; + + }