From dc8d6d89f685ab29b409cfee756ff3b890c1ed1d Mon Sep 17 00:00:00 2001
From: SondonYong <songdongyong@zcloudchina.com>
Date: Mon, 8 Dec 2025 13:48:02 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8ids=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zcloud/basic/info/dto/UserPageQry.java     |  1 +
 .../src/main/resources/mapper/UserMapper.xml       | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
index e721403..bd477cb 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java
@@ -26,6 +26,7 @@ public class UserPageQry extends PageQuery {
      */
     private Long eqCorpinfoId;
     private Long eqDepartmentId;
+    private Long[] inDepartmentId;
     private Long eqPostId;
     private Long eqRoleId;
     @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员")
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 77c7201..e4d03ca 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -347,11 +347,19 @@
             (u.flow_flag = 1 AND cp.id = #{params.eqDepartmentId} )
             )
         </if>
-        <if test="params.eqDepartmentId != null and params.eqDepartmentId != ''">
+        <if test="params.inDepartmentId != null and params.inDepartmentId.length > 0">
             AND (
-            (u.flow_flag = 0 AND u.department_id = #{params.eqDepartmentId} )
+            (u.flow_flag = 0 AND u.department_id IN
+            <foreach collection="params.inDepartmentId" item="departmentId" open="(" close=")" separator=",">
+                #{departmentId}
+            </foreach>
+            )
             OR
-            (u.flow_flag = 1 AND cp.id = #{params.eqDepartmentId} )
+            (u.flow_flag = 1 AND cp.id IN
+                <foreach collection="params.inDepartmentId" item="departmentId" open="(" close=")" separator=",">
+                    #{departmentId}
+                </foreach>
+            )
             )
         </if>
         <if test="params.likeName != null and params.likeName != ''">