From 3e9e35d311683204552cf98df9ab7c1f815081c8 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 20 May 2022 18:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E3=80=90system=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/OrganizationTreeNode.java    | 37 +++++++++++++++++++
 .../organization/entity/HrOrganization.java   |  7 ++++
 .../factory/OrganizationFactory.java          |  8 ++++
 3 files changed, 52 insertions(+)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java
index 78ee1dff3..73c84a581 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/OrganizationTreeNode.java
@@ -29,6 +29,7 @@ import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode;
 import cn.stylefeng.roses.kernel.rule.tree.xmtree.base.AbstractXmSelectNode;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -70,6 +71,42 @@ public class OrganizationTreeNode implements AbstractTreeNode<OrganizationTreeNo
     @ChineseDescription("是否选中")
     private boolean selected = false;
 
+    /**
+     * 组织名称
+     */
+    @ChineseDescription("组织名称")
+    private String orgName;
+
+    /**
+     * 组织编码
+     */
+    @ChineseDescription("组织编码")
+    private String orgCode;
+
+    /**
+     * 排序
+     */
+    @ChineseDescription("排序")
+    private BigDecimal orgSort;
+
+    /**
+     * 状态：1-启用，2-禁用
+     */
+    @ChineseDescription("状态：1-启用，2-禁用")
+    private Integer statusFlag;
+
+    /**
+     * 组织机构类型：1-公司，2-部门
+     */
+    @ChineseDescription("组织机构类型：1-公司，2-部门")
+    private Integer orgType;
+
+    /**
+     * 组织机构描述
+     */
+    @ChineseDescription("组织机构描述")
+    private String orgRemark;
+
     /**
      * 子节点的集合
      */
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 5eb52efb1..6d1500b4b 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
@@ -95,6 +95,13 @@ public class HrOrganization extends BaseEntity {
     @ChineseDescription("状态：1-启用，2-禁用")
     private Integer statusFlag;
 
+    /**
+     * 组织机构类型：1-公司，2-部门
+     */
+    @TableField(value = "org_type")
+    @ChineseDescription("组织机构类型：1-公司，2-部门")
+    private Integer orgType;
+
     /**
      * 组织机构描述
      */
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
index 66dc6b2ec..06dc4cc12 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
@@ -52,6 +52,14 @@ public class OrganizationFactory {
         treeNode.setId(hrOrganization.getOrgId());
         treeNode.setParentId(hrOrganization.getOrgParentId());
         treeNode.setTitle(hrOrganization.getOrgName());
+
+        treeNode.setOrgName(hrOrganization.getOrgName());
+        treeNode.setOrgCode(hrOrganization.getOrgCode());
+        treeNode.setStatusFlag(hrOrganization.getStatusFlag());
+        treeNode.setOrgSort(hrOrganization.getOrgSort());
+        treeNode.setOrgRemark(hrOrganization.getOrgRemark());
+        treeNode.setOrgType(hrOrganization.getOrgType());
+
         return treeNode;
     }