From 568c1620d29d216e769d04c60ca5982a4cf58fbc Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 11 May 2023 21:47:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90hr=E3=80=91?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/HrOrgApprover.java    |  4 ++
 .../organization/entity/HrOrganization.java   |  1 -
 .../organization/entity/HrPosition.java       | 41 ++++---------------
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java
index 670e8f7dd..dc9468ca0 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java
@@ -54,6 +54,10 @@ public class HrOrgApprover extends BaseEntity {
     @ChineseDescription("用户id")
     private Long userId;
 
+    //-------------------------------非实体字段-------------------------------
+    //-------------------------------非实体字段-------------------------------
+    //-------------------------------非实体字段-------------------------------
+
     /**
      * 绑定人员信息
      */
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 f9ec02336..6945ca29b 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
@@ -126,5 +126,4 @@ public class HrOrganization extends BaseBusinessEntity {
     @ChineseDescription("拓展字段")
     private Map<String, Object> 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 4da0ea325..0b61a2cc3 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,18 +24,17 @@
  */
 package cn.stylefeng.roses.kernel.system.modular.organization.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
-import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode;
-import com.baomidou.mybatisplus.annotation.FieldFill;
 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.List;
+import java.util.Map;
 
 /**
  * 系统职位表
@@ -46,7 +45,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("hr_position")
-public class HrPosition extends BaseEntity implements AbstractXmSelectNode {
+public class HrPosition extends BaseBusinessEntity {
 
     /**
      * 主键
@@ -91,34 +90,10 @@ public class HrPosition extends BaseEntity implements AbstractXmSelectNode {
     private String positionRemark;
 
     /**
-     * 删除标记：Y-已删除，N-未删除
+     * 拓展字段
      */
-    @TableField(value = "del_flag", fill = FieldFill.INSERT)
-    @ChineseDescription("删除标记：Y-已删除，N-未删除")
-    private String delFlag;
+    @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class)
+    @ChineseDescription("拓展字段")
+    private Map<String, Object> expandField;
 
-    @Override
-    public String getName() {
-        return this.positionName;
-    }
-
-    @Override
-    public String getValue() {
-        return String.valueOf(positionId);
-    }
-
-    @Override
-    public Boolean getSelected() {
-        return false;
-    }
-
-    @Override
-    public Boolean getDisabled() {
-        return false;
-    }
-
-    @Override
-    public List<?> getChildren() {
-        return null;
-    }
 }