From f28cd8d10e1249e156963c666331e8478775c9c7 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 17 Jun 2023 16:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90portal=E3=80=91=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=81=8C=E5=8A=A1=E5=90=8D=E7=A7=B0=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../position/service/HrPositionService.java   |  8 +++++++
 .../service/impl/HrPositionServiceImpl.java   | 24 +++++++++++++++++--
 .../impl/SysUserOrgServiceServiceImpl.java    |  3 +++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java
index a5c12abb0..d79c59266 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/HrPositionService.java
@@ -124,4 +124,12 @@ public interface HrPositionService extends IService<HrPosition>, PositionService
      */
     void fillDutyInfo(Long userId, List<HrOrganizationDTO> results);
 
+    /**
+     * 获取职务名称
+     *
+     * @author fengshuonan
+     * @since 2023/6/17 15:02
+     */
+    String getPositionName(Long positionId);
+
 }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java
index 759da02a6..dddd9c8db 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/position/service/impl/HrPositionServiceImpl.java
@@ -173,7 +173,9 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
         // 如果多组织列表为空，则直接返回默认的职务名称
         if (ObjectUtil.isEmpty(ptDuty)) {
             for (HrOrganizationDTO result : results) {
-                result.setPositionName(expandDutyInfo.getDuty());
+                if (ObjectUtil.isEmpty(result.getPositionName())) {
+                    result.setPositionName(expandDutyInfo.getDuty());
+                }
             }
         }
 
@@ -189,12 +191,30 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
             // 遍历参数的组织机构列表，填充职务名称
             for (HrOrganizationDTO result : results) {
                 if (result.getOrgId().equals(masterOrgIdCompanyId)) {
-                    result.setPositionName(dutyItem.getDutyName());
+                    if (ObjectUtil.isEmpty(result.getPositionName())) {
+                        result.setPositionName(dutyItem.getDutyName());
+                    }
                 }
             }
         }
     }
 
+    @Override
+    public String getPositionName(Long positionId) {
+        if (positionId == null) {
+            return null;
+        }
+        LambdaQueryWrapper<HrPosition> hrPositionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        hrPositionLambdaQueryWrapper.eq(HrPosition::getPositionId, positionId);
+        hrPositionLambdaQueryWrapper.select(HrPosition::getPositionName);
+        HrPosition one = this.getOne(hrPositionLambdaQueryWrapper, false);
+        if (one == null) {
+            return null;
+        } else {
+            return one.getPositionName();
+        }
+    }
+
     @Override
     public Integer positionNum() {
         return Convert.toInt(this.count());
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
index bc3e3b3cb..89256df4f 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
@@ -241,6 +241,9 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
                 continue;
             }
 
+            // 填充用户的职务名称positionName
+            companyInfo.setPositionName(hrPositionService.getPositionName(sysUserOrg.getPositionId()));
+
             // 判断是否已经加了这个公司
             boolean alreadyHave = false;
             for (HrOrganizationDTO dtoItem : results) {