From 4549ef3b28b50bb1c4906d24903c9f5ef60c1c04 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 13 Mar 2025 12:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E5=8F=8A?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8C=E6=97=B6=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml | 3 +++
 .../com/gxwebsoft/common/system/param/OrganizationParam.java  | 4 ++++
 2 files changed, 7 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 e411b6a..1fc4294 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,9 @@
             <if test="param.organizationId != null">
                 AND a.organization_id = #{param.organizationId}
             </if>
+            <if test="param.organizationIdWithChildren != null">
+                AND (a.organization_id = #{param.organizationIdWithChildren} OR a.parent_id = #{param.organizationIdWithChildren})
+            </if>
             <if test="param.parentId != null">
                 AND a.parent_id = #{param.parentId}
             </if>
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 bd9568f..bcf824a 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
@@ -133,4 +133,8 @@ public class OrganizationParam extends BaseParam {
     @TableField(exist = false)
     private String leaderUsername;
 
+    @ApiModelProperty(value = "企业及部门筛选")
+    @TableField(exist = false)
+    private Integer organizationIdWithChildren;
+
 }