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 24ed491d1..e4c7ec76c 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 @@ -35,6 +35,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.List; /** * 系统组织机构表 @@ -134,6 +135,12 @@ public class HrOrganizationRequest extends BaseRequest { @ChineseDescription("动态表单数据") private ExpandDataInfo expandDataInfo; + /** + * 限制从哪些组织机构中查询,传组织机构id集合 + */ + @ChineseDescription("限制从哪些组织机构中查询") + private List orgIdLimit; + /** * 组织机构树zTree形式 */ 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 5a27a2372..bfb411cdf 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 @@ -499,6 +499,16 @@ public class HrOrganizationServiceImpl extends ServiceImpl orgIdLimit = hrOrganizationRequest.getOrgIdLimit(); + if (ObjectUtil.isNotEmpty(orgIdLimit)) { + queryWrapper.nested(qw -> { + for (Long itemOrgId : orgIdLimit) { + qw.or().like(HrOrganization::getOrgPids, itemOrgId); + } + }); + } + return queryWrapper; }