From c517b75c4d0a1cc515addd2d45262c8d1408ae77 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 31 Oct 2022 20:14:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.3.2=E3=80=91=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/OrganizationServiceApi.java       | 10 +++++++++-
 .../service/impl/HrOrganizationServiceImpl.java  | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
index 308887e1c..c8ee1de58 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
@@ -56,6 +56,14 @@ public interface OrganizationServiceApi {
      */
     HrOrganizationDTO getOrgDetail(Long orgId);
 
+    /**
+     * 批量获取组织机构信息详情
+     *
+     * @author fengshuonan
+     * @date 2022/10/31 20:02
+     */
+    List<HrOrganizationDTO> getOrgDetailList(List<Long> orgIdList);
+
     /**
      * 获取组织机构下拉选择树
      *
@@ -80,7 +88,7 @@ public interface OrganizationServiceApi {
      *
      * @param orgId          指定机构id
      * @param parentLevelNum 上级机构的层级数，从0开始，0代表直接返回本部门
-     * @param detectModeEnum  自上而下还是自下而上
+     * @param detectModeEnum 自上而下还是自下而上
      * @return 上级机构的id
      * @author fengshuonan
      * @date 2022/9/18 15:02
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
index af7342944..91f0c4654 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
@@ -239,8 +239,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
             }
         }
 
-        if (ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgName())
-                || ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgCode())) {
+        if (ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgName()) || ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgCode())) {
             return treeNodeList;
         } else {
             return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList);
@@ -375,6 +374,16 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         return hrOrganizationDTO;
     }
 
+    @Override
+    public List<HrOrganizationDTO> getOrgDetailList(List<Long> orgIdList) {
+        ArrayList<HrOrganizationDTO> organizationDTOS = new ArrayList<>();
+        for (Long orgId : orgIdList) {
+            HrOrganizationDTO orgDetail = this.getOrgDetail(orgId);
+            organizationDTOS.add(orgDetail);
+        }
+        return organizationDTOS;
+    }
+
     @Override
     public List<OrganizationTreeNode> getOrgTreeList(HrOrganizationRequest hrOrganizationRequest) {
 
@@ -519,8 +528,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
             HrOrganization parentOrganization = this.queryOrganization(hrOrganizationRequest);
 
             // 设置本节点的父ids为 (上一个节点的pids + (上级节点的id) )
-            hrOrganization.setOrgPids(
-                    parentOrganization.getOrgPids() + SymbolConstant.LEFT_SQUARE_BRACKETS + parentOrganization.getOrgId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA);
+            hrOrganization.setOrgPids(parentOrganization.getOrgPids() + SymbolConstant.LEFT_SQUARE_BRACKETS + parentOrganization.getOrgId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA);
         }
     }