diff --git a/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/pojo/entity/BaseExpandFieldEntity.java b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/pojo/entity/BaseExpandFieldEntity.java new file mode 100644 index 000000000..9971ad42d --- /dev/null +++ b/kernel-d-db/db-api/src/main/java/cn/stylefeng/roses/kernel/db/api/pojo/entity/BaseExpandFieldEntity.java @@ -0,0 +1,56 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处,作者声明等。 + * 4.分发源码时候,请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点,可申请商业授权 + */ +package cn.stylefeng.roses.kernel.db.api.pojo.entity; + +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Map; + +/** + * 基础业务性质的实体 + *

+ * 具有乐观锁,业务逻辑删除,租户id标识 + * + * @author fengshuonan + * @since 2023/5/11 13:22 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class BaseExpandFieldEntity extends BaseBusinessEntity { + + private static final long serialVersionUID = 1L; + + /** + * 拓展字段 + */ + @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class) + @ChineseDescription("拓展字段") + private Map expandField; + +} diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java index 6945ca29b..d15f14643 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java @@ -1,14 +1,12 @@ package cn.stylefeng.roses.kernel.system.modular.organization.entity; -import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity; +import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.*; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.Map; /** * 组织机构信息实例类 @@ -19,7 +17,7 @@ import java.util.Map; @TableName(value = "hr_organization", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) -public class HrOrganization extends BaseBusinessEntity { +public class HrOrganization extends BaseExpandFieldEntity { /** * 主键 @@ -119,11 +117,4 @@ public class HrOrganization extends BaseBusinessEntity { @ChineseDescription("对接外部主数据的父级机构id") private String masterOrgParentId; - /** - * 拓展字段 - */ - @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class) - @ChineseDescription("拓展字段") - private Map expandField; - } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java index 0b61a2cc3..5f40379c2 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java @@ -24,17 +24,15 @@ */ package cn.stylefeng.roses.kernel.system.modular.organization.entity; -import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity; +import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.Map; /** * 系统职位表 @@ -45,7 +43,7 @@ import java.util.Map; @Data @EqualsAndHashCode(callSuper = true) @TableName("hr_position") -public class HrPosition extends BaseBusinessEntity { +public class HrPosition extends BaseExpandFieldEntity { /** * 主键 @@ -89,11 +87,4 @@ public class HrPosition extends BaseBusinessEntity { @ChineseDescription("职位备注") private String positionRemark; - /** - * 拓展字段 - */ - @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class) - @ChineseDescription("拓展字段") - private Map expandField; - } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java index 0d1fa4c17..0f25fcab1 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java @@ -24,18 +24,15 @@ */ package cn.stylefeng.roses.kernel.system.modular.user.entity; -import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity; -import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseExpandFieldEntity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; -import java.util.Map; /** * 系统用户表 @@ -46,7 +43,7 @@ import java.util.Map; @EqualsAndHashCode(callSuper = true) @Data @TableName("sys_user") -public class SysUser extends BaseBusinessEntity { +public class SysUser extends BaseExpandFieldEntity { /** * 主键 @@ -150,11 +147,4 @@ public class SysUser extends BaseBusinessEntity { @TableField("master_user_id") private String masterUserId; - /** - * 拓展字段 - */ - @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class) - @ChineseDescription("拓展字段") - private Map expandField; - }