diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml index 1fc4294..dbc8e84 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml @@ -29,6 +29,12 @@ AND a.organization_id = #{param.organizationId} + + AND a.organization_id IN + + #{item} + + AND (a.organization_id = #{param.organizationIdWithChildren} OR a.parent_id = #{param.organizationIdWithChildren}) diff --git a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java index 9e5e999..3668de3 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java @@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.util.Date; +import java.util.Set; /** * 组织机构查询参数 @@ -30,6 +31,10 @@ public class OrganizationParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer organizationId; + @Schema(description = "机构id合集") + @TableField(exist = false) + private Set organizationIds; + @Schema(description = "上级id, 0是顶级") @QueryField(type = QueryType.EQ) private Integer parentId;