From 0ba098f14ecea6df56870dff67dd274fd21294fb Mon Sep 17 00:00:00 2001
From: stylefeng <sn93@qq.com>
Date: Tue, 21 Jan 2025 18:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=BA=E6=9E=84=E7=9A=84=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/sys/modular/org/entity/HrOrganization.java      | 7 +++++++
 .../modular/org/pojo/request/HrOrganizationRequest.java    | 6 ++++++
 .../org/service/impl/HrOrganizationServiceImpl.java        | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java
index ca43e565e..1360919ab 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java
@@ -119,6 +119,13 @@ public class HrOrganization extends BaseExpandFieldEntity implements AbstractTre
     @ChineseDescription("对接外部主数据的父级机构id")
     private String masterOrgParentId;
 
+    /**
+     * 组织机构层级编码，来自sys_hr_organization_level表
+     */
+    @TableField("level_code")
+    @ChineseDescription("组织机构层级编码，来自sys_hr_organization_level表")
+    private String levelCode;
+
     /**
      * 租户id
      */
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
index 33c4b09f7..b7b88007f 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/pojo/request/HrOrganizationRequest.java
@@ -109,6 +109,12 @@ public class HrOrganizationRequest extends BaseRequest {
     @ChineseDescription("对接外部主数据的机构id")
     private String masterOrgId;
 
+    /**
+     * 组织机构层级编码，来自sys_hr_organization_level表
+     */
+    @ChineseDescription("组织机构层级编码，来自sys_hr_organization_level表")
+    private String levelCode;
+
     /**
      * 对接外部主数据的父级机构id
      */
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
index f41957d95..662f8c210 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
@@ -175,7 +175,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         wrapper.eq(HrOrganization::getOrgId, hrOrganizationRequest.getOrgId());
         wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgName, HrOrganization::getOrgShortName, HrOrganization::getOrgCode,
                 HrOrganization::getOrgParentId, HrOrganization::getOrgSort, HrOrganization::getOrgType, HrOrganization::getStatusFlag,
-                HrOrganization::getTaxNo, HrOrganization::getRemark, HrOrganization::getOrgPids);
+                HrOrganization::getTaxNo, HrOrganization::getRemark, HrOrganization::getOrgPids, HrOrganization::getLevelCode);
 
         HrOrganization hrOrganization = this.getOne(wrapper, false);
         if (ObjectUtil.isEmpty(hrOrganization)) {