From de6e4fb3a51c814eafc3701ade3b9ba0501a67cc Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 2 Nov 2022 14:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.3.2=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/organization/HrOrganizationRequest.java  | 15 ++++++++++++++-
 .../controller/HrOrganizationController.java      | 13 +++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
index 8cbb8e5ba..44285b214 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
@@ -29,11 +29,11 @@ import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
 import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
 import cn.stylefeng.roses.kernel.validator.api.validators.unique.TableUniqueValue;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
@@ -155,6 +155,13 @@ public class HrOrganizationRequest extends BaseRequest {
     @ChineseDescription("限制从哪些组织机构中查询")
     private List<Long> orgIdLimit;
 
+    /**
+     * 组织机构id集合
+     */
+    @ChineseDescription("组织机构id集合")
+    @NotEmpty(message = "组织机构id集合不能为空", groups = batchQuery.class)
+    private List<Long> orgIdList;
+
     /**
      * 组织机构树zTree形式
      */
@@ -167,4 +174,10 @@ public class HrOrganizationRequest extends BaseRequest {
     public @interface userBindOrgScope {
     }
 
+    /**
+     * 批量根据id查询
+     */
+    public @interface batchQuery {
+    }
+
 }
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
index 3186809be..c789128af 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
@@ -34,6 +34,7 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.system.api.enums.OrgTypeEnum;
+import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
 import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequest;
 import cn.stylefeng.roses.kernel.system.api.pojo.organization.OrganizationTreeNode;
 import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization;
@@ -241,4 +242,16 @@ public class HrOrganizationController {
         return new SuccessResponseData<>(list);
     }
 
+    /**
+     * 批量获取组织机构信息列表
+     *
+     * @author fengshuonan
+     * @date 2022/11/2 13:56
+     */
+    @GetResource(name = "批量获取组织机构信息列表", path = "/hrOrganization/getOrgInfoListByIds")
+    public ResponseData<List<HrOrganizationDTO>> getOrgInfoListByIds(@Validated(HrOrganizationRequest.batchQuery.class) HrOrganizationRequest hrOrganizationRequest) {
+        List<HrOrganizationDTO> orgDetailList = hrOrganizationService.getOrgDetailList(hrOrganizationRequest.getOrgIdList());
+        return new SuccessResponseData<>(orgDetailList);
+    }
+
 }