From 182d6fff0ea17a980c0de15ac4c220996c821083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 13 Jan 2026 16:53:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E6=B7=BB=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84ID=E9=9B=86=E5=90=88=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在OrganizationParam中新增organizationIds字段用于存储机构ID集合 - 为organizationIds字段添加Schema注解描述和TableField注解标记为非数据库字段 - 在OrganizationMapper.xml中添加IN查询条件支持organizationIds参数 - 使用foreach标签实现动态SQL的IN查询逻辑 - 支持通过多个机构ID进行批量查询操作 --- .../common/system/mapper/xml/OrganizationMapper.xml | 6 ++++++ .../gxwebsoft/common/system/param/OrganizationParam.java | 5 +++++ 2 files changed, 11 insertions(+) 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;