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 632350a5..9ae1b9e1 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
@@ -42,5 +42,7 @@ public class UserQryCmd {
// 入职状态
@ApiModelProperty(value = "入职状态 入职状态,0-离职, 1-在职, 2-信息变更中, 3-未入职, 4-实习生, 5-实习结束, 6-退休, 7-劳务派遣, 8-劳务派遣结束, 11-入职待审核, 10-离职待审核")
private Integer employmentFlag;
+ @ApiModelProperty(value = "是否存在人资系统, 1-是, 0-否")
+ private Integer rzFlag;
}
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
index aef2e0c8..7a5d71fe 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserCO.java
@@ -102,7 +102,7 @@ public class UserCO extends ClientObject {
//人员在部门中的排序
@ApiModelProperty(value = "人员在部门中的排序")
private Integer sort;
- @ApiModelProperty(value = "是否存在人资系统, 1-存在, 0-不存在")
+ @ApiModelProperty(value = "是否存在人资系统, 1-是, 0-否")
private Integer rzFlag;
//乐观锁
diff --git a/web-infrastructure/src/main/resources/mapper/UserMapper.xml b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
index 649681cd..26623be2 100644
--- a/web-infrastructure/src/main/resources/mapper/UserMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/UserMapper.xml
@@ -53,6 +53,7 @@
u.political_affiliation_name,
u.employment_flag,
u.flow_flag,
+ u.rz_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
@@ -89,6 +90,9 @@
and u.flow_flag = #{params.flowFlag}
+
+ and u.rz_flag = #{params.rzFlag}
+