【8.0】【sys】增加4个基础业务的租户标识

kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java

@@ -3,10 +3,7 @@ package cn.stylefeng.roses.kernel.sys.modular.org.entity;
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -122,6 +119,13 @@ public class HrOrganization extends BaseExpandFieldEntity implements AbstractTre
     @ChineseDescription("对接外部主数据的父级机构id")
     private String masterOrgParentId;
 
+    /**
+     * 租户id
+     */
+    @TableField(value = "tenant_id", fill = FieldFill.INSERT)
+    @ChineseDescription("租户id")
+    private Long tenantId;
+
     //-------------------------------非实体字段-------------------------------
     //-------------------------------非实体字段-------------------------------
     //-------------------------------非实体字段-------------------------------

kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/position/entity/HrPosition.java

@@ -2,10 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.position.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -64,4 +61,11 @@ public class HrPosition extends BaseExpandFieldEntity {
     @ChineseDescription("备注")
     private String remark;
 
+    /**
+     * 租户id
+     */
+    @TableField(value = "tenant_id", fill = FieldFill.INSERT)
+    @ChineseDescription("租户id")
+    private Long tenantId;
+
 }

kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/entity/SysUser.java

@@ -9,10 +9,7 @@ import cn.stylefeng.roses.kernel.rule.enums.SexEnum;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
 import cn.stylefeng.roses.kernel.sys.api.enums.user.UserStatusEnum;
 import cn.stylefeng.roses.kernel.sys.api.pojo.user.UserOrgDTO;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -168,6 +165,13 @@ public class SysUser extends BaseExpandFieldEntity {
     @ChineseDescription("对接外部主数据的用户id")
     private String masterUserId;
 
+    /**
+     * 租户id
+     */
+    @TableField(value = "tenant_id", fill = FieldFill.INSERT)
+    @ChineseDescription("租户id")
+    private Long tenantId;
+
     //-------------------------------非实体字段-------------------------------
     //-------------------------------非实体字段-------------------------------
     //-------------------------------非实体字段-------------------------------

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/SysRole.java

@@ -2,10 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.role.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -78,4 +75,11 @@ public class SysRole extends BaseExpandFieldEntity {
     @ChineseDescription("是否是系统角色：Y-是，N-否。系统角色不能删除")
     private String roleSystemFlag;
 
+    /**
+     * 租户id
+     */
+    @TableField(value = "tenant_id", fill = FieldFill.INSERT)
+    @ChineseDescription("租户id")
+    private Long tenantId;
+
 }