From 90d304e45ef6107b57f9f3915e6c981fe4d68fc3 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 9 Feb 2026 10:57:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E6=B5=81?=
 =?UTF-8?q?=E5=8A=A8=E4=BA=BA=E5=91=98=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zcloud/basic/info/dto/UserQryCmd.java     | 10 +++++++++-
 .../src/main/resources/mapper/UserMapper.xml           |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java
index b0613b94..632350a5 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java
@@ -1,8 +1,11 @@
 package com.zcloud.basic.info.dto;
 
 import com.alibaba.cola.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 
 /**
  * web-client
@@ -26,7 +29,6 @@ public class UserQryCmd {
     private String eqCorpinfoId;
     private String eqDepartmentId;
     private String eqPostId;
-    private String eqEmploymentFlag;
 
     private Long corpinfoId;
     private Long departmentId;
@@ -34,5 +36,11 @@ public class UserQryCmd {
     private String username;
     private Integer noMain;
     private String isMyCorp;
+
+    @ApiModelProperty(value = "是否流动人员，1-流动，0-固定人员", name = "flowFlag")
+    private Integer flowFlag;
+    // 入职状态
+    @ApiModelProperty(value = "入职状态 入职状态，0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核")
+    private Integer employmentFlag;
 }
 
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 842c1058..649681cd 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -52,6 +52,7 @@
         u.political_affiliation,
         u.political_affiliation_name,
         u.employment_flag,
+        u.flow_flag,
         CASE
         WHEN LENGTH(FROM_BASE64(u.user_id_card)) > 0
         AND MOD(SUBSTRING(FROM_BASE64(u.user_id_card), 17, 1), 2) = 1 THEN
@@ -85,6 +86,9 @@
             <if test="params.employmentFlag != null">
                 and u.employment_flag = #{params.employmentFlag}
             </if>
+            <if test="params.flowFlag != null">
+                and u.flow_flag = #{params.flowFlag}
+            </if>
 
 
             <if test="params.postId != null">