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 orgIdLimit; + /** + * 组织机构id集合 + */ + @ChineseDescription("组织机构id集合") + @NotEmpty(message = "组织机构id集合不能为空", groups = batchQuery.class) + private List 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> getOrgInfoListByIds(@Validated(HrOrganizationRequest.batchQuery.class) HrOrganizationRequest hrOrganizationRequest) { + List orgDetailList = hrOrganizationService.getOrgDetailList(hrOrganizationRequest.getOrgIdList()); + return new SuccessResponseData<>(orgDetailList); + } + }